diff --git a/de.bmotionstudio.gef.editor/META-INF/MANIFEST.MF b/de.bmotionstudio.gef.editor/META-INF/MANIFEST.MF
index 13f2dfd6507661107d8c7e731302071ee642d12d..64a51d2ad66fa780eabb77adc94d41844a312837 100644
--- a/de.bmotionstudio.gef.editor/META-INF/MANIFEST.MF
+++ b/de.bmotionstudio.gef.editor/META-INF/MANIFEST.MF
@@ -4,150 +4,152 @@ Bundle-Name: BMotion Studio Editor Plug-in
 Bundle-SymbolicName: de.bmotionstudio.gef.editor;singleton:=true
 Bundle-Version: 5.6.0.qualifier
 Bundle-Activator: de.bmotionstudio.gef.editor.BMotionEditorPlugin
-Require-Bundle: org.eclipse.ui;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.ui.ide;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.ui.views;bundle-version="[3.5.0,4.0.0)";visibility:=reexport,
- org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
+Require-Bundle: de.prob.core;bundle-version="[9.5.0,9.6.0)";visibility:=reexport,
  org.eclipse.core.databinding;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.jface.databinding;bundle-version="[1.2.1,2.0.0)",
  org.eclipse.core.databinding.beans;bundle-version="[1.1.1,2.0.0)",
+ org.eclipse.core.resources;bundle-version="[3.5.0,4.0.0)",
+ org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.gef;bundle-version="[3.7.0,4.0.0)";visibility:=reexport,
- de.prob.core;bundle-version="[9.5.0,9.6.0)";visibility:=reexport,
- org.eventb.core;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.help;bundle-version="3.5.100",
- org.eclipse.core.resources;bundle-version="[3.5.0,4.0.0)",
- org.rodinp.core;bundle-version="[1.7.0,2.0.0)",
- org.eventb.core.ast;bundle-version="[3.0.0,4.0.0)"
+ org.eclipse.jface.databinding;bundle-version="[1.2.1,2.0.0)",
+ org.eclipse.ui;bundle-version="[3.5.0,4.0.0)",
+ org.eclipse.ui.ide;bundle-version="[3.5.0,4.0.0)",
+ org.eclipse.ui.views;bundle-version="[3.5.0,4.0.0)";visibility:=reexport,
+ org.eventb.core;bundle-version="[3.0.0,4.0.0)",
+ org.eventb.core.ast;bundle-version="[3.0.0,4.0.0)",
+ org.rodinp.core;bundle-version="[1.7.0,2.0.0)"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Eclipse-RegisterBuddy: de.prob.core
 Bundle-Vendor: HHU Düsseldorf STUPS Group
-Export-Package: de.bmotionstudio.gef.editor;
-  uses:="org.eclipse.jface.wizard,
-   org.eclipse.core.runtime,
-   de.prob.core,
-   org.eclipse.gef.editparts,
-   org.eclipse.gef.palette,
-   org.eclipse.jface.action,
-   org.eclipse.gef.commands,
-   org.eclipse.core.resources,
-   org.eclipse.jface.viewers,
-   de.bmotionstudio.gef.editor.model,
-   org.eclipse.gef.ui.parts,
-   org.eclipse.gef,
-   org.eclipse.gef.ui.properties,
-   org.eclipse.jface.resource,
-   org.eclipse.gef.ui.actions,
-   org.eclipse.ui,
-   org.eclipse.ui.views.properties,
-   org.eclipse.ui.plugin,
-   de.bmotionstudio.gef.editor.part,
-   org.eclipse.ui.part,
-   org.eclipse.draw2d,
-   de.prob.core.domainobjects,
-   org.eclipse.gef.requests,
-   org.eclipse.swt.graphics,
-   org.osgi.framework,
-   org.eclipse.swt.widgets,
-   org.eclipse.gef.ui.palette",
- de.bmotionstudio.gef.editor.attribute;uses:="org.eclipse.ui.views.properties,de.bmotionstudio.gef.editor.model",
- de.bmotionstudio.gef.editor.command;
-  uses:="de.bmotionstudio.gef.editor.observer,
-   org.eclipse.gef.commands,
-   org.eclipse.draw2d.geometry,
-   de.bmotionstudio.gef.editor.model,
-   de.bmotionstudio.gef.editor.scheduler",
- de.bmotionstudio.gef.editor.edit;
-  uses:="org.eclipse.jface.window,
-   org.eclipse.core.databinding,
-   de.bmotionstudio.gef.editor.part,
-   org.eclipse.draw2d,
-   org.eclipse.gef.tools,
-   org.eclipse.jface.databinding.viewers,
-   org.eclipse.jface.fieldassist,
-   org.eclipse.core.databinding.observable.value,
-   org.eclipse.jface.bindings.keys,
-   org.eclipse.jface.viewers,
-   org.eclipse.swt.graphics,
-   de.bmotionstudio.gef.editor.model,
-   org.eclipse.swt.widgets",
- de.bmotionstudio.gef.editor.editpolicy;
-  uses:="org.eclipse.gef.commands,
-   org.eclipse.gef.requests,
-   org.eclipse.draw2d.geometry,
-   de.bmotionstudio.gef.editor.model,
-   org.eclipse.gef.editpolicies,
-   org.eclipse.draw2d,
-   org.eclipse.gef",
- de.bmotionstudio.gef.editor.eventb;
-  uses:="org.eventb.core.basis,
-   org.eclipse.core.resources,
-   org.eventb.core.ast,
-   org.eventb.core,
-   de.bmotionstudio.gef.editor.model,
-   de.bmotionstudio.gef.editor",
- de.bmotionstudio.gef.editor.figure;
-  uses:="org.eclipse.draw2d.geometry,
-   org.eclipse.swt.graphics,
-   de.bmotionstudio.gef.editor.model,
-   org.eclipse.draw2d",
- de.bmotionstudio.gef.editor.library;
-  uses:="org.eclipse.ui,
-   org.eclipse.ui.part,
-   de.bmotionstudio.gef.editor,
-   org.eclipse.jface.action,
-   org.eclipse.gef.dnd,
-   org.eclipse.gef.commands,
-   org.eclipse.jface.viewers,
-   org.eclipse.swt.graphics,
-   org.eclipse.draw2d.geometry,
-   de.bmotionstudio.gef.editor.model,
-   org.eclipse.swt.widgets,
-   org.eclipse.gef",
- de.bmotionstudio.gef.editor.model;
-  uses:="org.eclipse.core.runtime,
-   de.bmotionstudio.gef.editor.attribute,
-   de.bmotionstudio.gef.editor,
-   de.bmotionstudio.gef.editor.observer,
-   org.eclipse.gef.commands,
-   org.eclipse.core.resources,
-   org.eclipse.swt.graphics,
-   org.eclipse.draw2d.geometry,
-   org.eclipse.gef.rulers,
-   de.bmotionstudio.gef.editor.scheduler",
- de.bmotionstudio.gef.editor.observer;
-  uses:="org.eclipse.swt.graphics,
-   de.bmotionstudio.gef.editor.model,
-   org.eclipse.draw2d,
-   de.bmotionstudio.gef.editor.scheduler,
-   de.bmotionstudio.gef.editor",
- de.bmotionstudio.gef.editor.part;
-  uses:="de.bmotionstudio.gef.editor.observer,
-   org.eclipse.core.runtime,
-   org.eclipse.gef.editparts,
-   org.eclipse.swt.graphics,
-   de.bmotionstudio.gef.editor.model,
-   org.eclipse.draw2d,
-   de.bmotionstudio.gef.editor.library,
-   org.eclipse.gef",
- de.bmotionstudio.gef.editor.property;
-  uses:="org.eclipse.swt.events,
-   org.eclipse.ui.views.properties,
-   org.eclipse.swt.graphics,
-   org.eclipse.jface.viewers,
-   org.eclipse.swt.widgets,
-   org.eclipse.jface.dialogs,
-   de.bmotionstudio.gef.editor.library",
- de.bmotionstudio.gef.editor.scheduler;
-  uses:="de.bmotionstudio.gef.editor.observer,
-   org.eclipse.swt.graphics,
-   de.bmotionstudio.gef.editor.model,
-   de.bmotionstudio.gef.editor",
- de.bmotionstudio.gef.editor.util;
-  uses:="org.eclipse.jface.viewers,
-   de.bmotionstudio.gef.editor.model,
-   org.eclipse.swt.widgets,
-   de.bmotionstudio.gef.editor"
+Export-Package: de.bmotionstudio.gef.editor;uses:="
+  de.bmotionstudio.gef.editor.model,
+  de.bmotionstudio.gef.editor.part,
+  de.prob.core,
+  de.prob.core.domainobjects,
+  org.eclipse.core.resources,
+  org.eclipse.core.runtime,
+  org.eclipse.draw2d,
+  org.eclipse.gef,
+  org.eclipse.gef.commands,
+  org.eclipse.gef.editparts,
+  org.eclipse.gef.palette,
+  org.eclipse.gef.requests,
+  org.eclipse.gef.ui.actions,
+  org.eclipse.gef.ui.palette,
+  org.eclipse.gef.ui.parts,
+  org.eclipse.gef.ui.properties,
+  org.eclipse.jface.action,
+  org.eclipse.jface.resource,
+  org.eclipse.jface.viewers,
+  org.eclipse.jface.wizard,
+  org.eclipse.swt.graphics,
+  org.eclipse.swt.widgets,
+  org.eclipse.ui,
+  org.eclipse.ui.part,
+  org.eclipse.ui.plugin,
+  org.eclipse.ui.views.properties,
+  org.osgi.framework",
+ de.bmotionstudio.gef.editor.attribute;uses:="
+  org.eclipse.ui.views.properties,
+  de.bmotionstudio.gef.editor.model",
+ de.bmotionstudio.gef.editor.command;uses:="
+  de.bmotionstudio.gef.editor.model,
+  de.bmotionstudio.gef.editor.observer,
+  de.bmotionstudio.gef.editor.scheduler,
+  org.eclipse.draw2d.geometry,
+  org.eclipse.gef.commands",
+ de.bmotionstudio.gef.editor.edit;uses:="
+  de.bmotionstudio.gef.editor.model,
+  de.bmotionstudio.gef.editor.part,
+  org.eclipse.core.databinding,
+  org.eclipse.core.databinding.observable.value,
+  org.eclipse.draw2d,
+  org.eclipse.gef.tools,
+  org.eclipse.jface.bindings.keys,
+  org.eclipse.jface.databinding.viewers,
+  org.eclipse.jface.fieldassist,
+  org.eclipse.jface.viewers,
+  org.eclipse.jface.window,
+  org.eclipse.swt.graphics,
+  org.eclipse.swt.widgets",
+ de.bmotionstudio.gef.editor.editpolicy;uses:="
+  de.bmotionstudio.gef.editor.model,
+  org.eclipse.draw2d,
+  org.eclipse.draw2d.geometry,
+  org.eclipse.gef,
+  org.eclipse.gef.commands,
+  org.eclipse.gef.editpolicies,
+  org.eclipse.gef.requests",
+ de.bmotionstudio.gef.editor.eventb;uses:="
+  de.bmotionstudio.gef.editor,
+  de.bmotionstudio.gef.editor.model,
+  org.eclipse.core.resources,
+  org.eventb.core,
+  org.eventb.core.ast,
+  org.eventb.core.basis",
+ de.bmotionstudio.gef.editor.figure;uses:="
+  de.bmotionstudio.gef.editor.model,
+  org.eclipse.draw2d,
+  org.eclipse.draw2d.geometry,
+  org.eclipse.swt.graphics",
+ de.bmotionstudio.gef.editor.library;uses:="
+  de.bmotionstudio.gef.editor,
+  de.bmotionstudio.gef.editor.model,
+  org.eclipse.draw2d.geometry,
+  org.eclipse.gef,
+  org.eclipse.gef.commands,
+  org.eclipse.gef.dnd,
+  org.eclipse.jface.action,
+  org.eclipse.jface.viewers,
+  org.eclipse.swt.graphics,
+  org.eclipse.swt.widgets,
+  org.eclipse.ui,
+  org.eclipse.ui.part",
+ de.bmotionstudio.gef.editor.model;uses:="
+  de.bmotionstudio.gef.editor,
+  de.bmotionstudio.gef.editor.attribute,
+  de.bmotionstudio.gef.editor.observer,
+  de.bmotionstudio.gef.editor.scheduler,
+  org.eclipse.core.resources,
+  org.eclipse.core.runtime,
+  org.eclipse.draw2d.geometry,
+  org.eclipse.gef.commands,
+  org.eclipse.gef.rulers,
+  org.eclipse.swt.graphics",
+ de.bmotionstudio.gef.editor.observer;uses:="
+  de.bmotionstudio.gef.editor,
+  de.bmotionstudio.gef.editor.model,
+  de.bmotionstudio.gef.editor.scheduler,
+  org.eclipse.draw2d,
+  org.eclipse.swt.graphics",
+ de.bmotionstudio.gef.editor.part;uses:="
+  de.bmotionstudio.gef.editor.library,
+  de.bmotionstudio.gef.editor.model,
+  de.bmotionstudio.gef.editor.observer,
+  org.eclipse.core.runtime,
+  org.eclipse.draw2d,
+  org.eclipse.gef,
+  org.eclipse.gef.editparts,
+  org.eclipse.swt.graphics",
+ de.bmotionstudio.gef.editor.property;uses:="
+  de.bmotionstudio.gef.editor.library,
+  org.eclipse.jface.dialogs,
+  org.eclipse.jface.viewers,
+  org.eclipse.swt.events,
+  org.eclipse.swt.graphics,
+  org.eclipse.swt.widgets,
+  org.eclipse.ui.views.properties",
+ de.bmotionstudio.gef.editor.scheduler;uses:="
+  de.bmotionstudio.gef.editor,
+  de.bmotionstudio.gef.editor.model,
+  de.bmotionstudio.gef.editor.observer,
+  org.eclipse.swt.graphics",
+ de.bmotionstudio.gef.editor.util;uses:="
+  de.bmotionstudio.gef.editor,
+  de.bmotionstudio.gef.editor.model,
+  org.eclipse.jface.viewers,
+  org.eclipse.swt.widgets"
 Bundle-ClassPath: .,
  lib/dependencies/mxparser-1.2.2.jar,
  lib/dependencies/xmlpull-1.1.3.1.jar,
diff --git a/de.prob.core.tests/META-INF/MANIFEST.MF b/de.prob.core.tests/META-INF/MANIFEST.MF
index d244c60cefa3c32c6426613f35e8f204fe8f91b3..dc159740906628438ecd42aab4b9c13008d9546b 100644
--- a/de.prob.core.tests/META-INF/MANIFEST.MF
+++ b/de.prob.core.tests/META-INF/MANIFEST.MF
@@ -4,13 +4,13 @@ Bundle-Name: Tests
 Bundle-SymbolicName: de.prob.core.tests
 Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: de.prob.core.tests.Activator
-Require-Bundle: org.eclipse.ui,
+Require-Bundle: de.prob.core;bundle-version="[9.5.0,9.6.0)",
  org.eclipse.core.resources,
  org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
+ org.eclipse.ui,
  org.eventb.core;bundle-version="[3.3.0,4.0.0)",
  org.eventb.core.ast;bundle-version="[3.3.0,4.0.0)",
  org.junit;bundle-version="[4.0.0,5.0.0)",
- org.rodinp.core;bundle-version="[1.7.0,2.0.0)",
- de.prob.core;bundle-version="[9.5.0,9.6.0)"
+ org.rodinp.core;bundle-version="[1.7.0,2.0.0)"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-11
diff --git a/de.prob.core/META-INF/MANIFEST.MF b/de.prob.core/META-INF/MANIFEST.MF
index 3ab27fbdd0279435c710fa2154d483616851c4c2..f19d75215435a0448fe8e8c5cbd14a04d7869e30 100644
--- a/de.prob.core/META-INF/MANIFEST.MF
+++ b/de.prob.core/META-INF/MANIFEST.MF
@@ -3,14 +3,14 @@ Bundle-ManifestVersion: 2
 Bundle-Name: ProB Animator Core
 Bundle-SymbolicName: de.prob.core;singleton:=true
 Bundle-Version: 9.5.0.qualifier
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.core.filesystem,
- org.rodinp.core;bundle-version="[1.7.0,2.0.0)",
- org.eventb.theory.core;bundle-version="[4.0.0,4.1.0)";resolution:=optional,
- org.eventb.core.ast;bundle-version="[3.3.0,4.0.0)",
+Require-Bundle: org.eclipse.core.filesystem,
  org.eclipse.core.resources;bundle-version="[3.5.0,4.0.0)",
+ org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
+ org.eventb.core;bundle-version="[3.3.0,4.0.0)",
+ org.eventb.core.ast;bundle-version="[3.3.0,4.0.0)",
  org.eventb.core.seqprover;bundle-version="[3.2.0,4.0.0)",
- org.eventb.core;bundle-version="[3.3.0,4.0.0)"
+ org.eventb.theory.core;bundle-version="[4.0.0,4.1.0)";resolution:=optional,
+ org.rodinp.core;bundle-version="[1.7.0,2.0.0)"
 Bundle-ActivationPolicy: lazy
 Eclipse-BundleShape: dir
 Bundle-Vendor: HHU Dusseldorf STUPS Group
diff --git a/de.prob.eventb.disprover.core/META-INF/MANIFEST.MF b/de.prob.eventb.disprover.core/META-INF/MANIFEST.MF
index 074bca981aba6b68bae897a60f12b6b0367410ad..7b610c8c1706dc85924202a8e27648315ce5b00b 100644
--- a/de.prob.eventb.disprover.core/META-INF/MANIFEST.MF
+++ b/de.prob.eventb.disprover.core/META-INF/MANIFEST.MF
@@ -4,12 +4,12 @@ Bundle-Name: ProB Disprover Core for EventB
 Bundle-SymbolicName: de.prob.eventb.disprover.core;singleton:=true
 Bundle-Version: 2.1.0.qualifier
 Bundle-Vendor: Heinrich-Heine University Dusseldorf
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
- de.prob.core;bundle-version="[9.5.0,9.6.0)",
- org.eventb.core.seqprover;bundle-version="[3.0.0,4.0.0)",
- org.eventb.core;bundle-version="[3.0.0,4.0.0)",
+Require-Bundle: de.prob.core;bundle-version="[9.5.0,9.6.0)",
+ org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.ui;bundle-version="[3.5.0,4.0.0)",
+ org.eventb.core;bundle-version="[3.0.0,4.0.0)",
  org.eventb.core.ast;bundle-version="[3.0.0,4.0.0)",
+ org.eventb.core.seqprover;bundle-version="[3.0.0,4.0.0)",
  org.rodinp.core;bundle-version="[1.7.0,2.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-ActivationPolicy: lazy
diff --git a/de.prob.eventb.disprover.ui/META-INF/MANIFEST.MF b/de.prob.eventb.disprover.ui/META-INF/MANIFEST.MF
index 98d31f529bc8b087d2d64d11f31b2d241f21d2e6..16761b4a150f160ed107f31e0142c24164b0bd73 100644
--- a/de.prob.eventb.disprover.ui/META-INF/MANIFEST.MF
+++ b/de.prob.eventb.disprover.ui/META-INF/MANIFEST.MF
@@ -4,17 +4,17 @@ Bundle-Name: ProB Disprover UI for EventB
 Bundle-SymbolicName: de.prob.eventb.disprover.ui;singleton:=true
 Bundle-Version: 2.1.0.qualifier
 Bundle-Vendor: Heinrich-Heine University Dusseldorf
-Require-Bundle: org.eclipse.core.runtime,
- org.eventb.ui;bundle-version="[3.0.0,4.0.0)",
+Require-Bundle: de.prob.core;bundle-version="[9.5.0,9.6.0)",
  de.prob.eventb.disprover.core;bundle-version="[2.1.0,2.2.0)",
+ de.prob.ui;bundle-version="[7.5.0,7.6.0)",
+ org.eclipse.core.runtime,
+ org.eclipse.osgi,
  org.eclipse.ui;bundle-version="[3.5.0,4.0.0)",
- de.prob.core;bundle-version="[9.5.0,9.6.0)",
+ org.eventb.core;bundle-version="[3.0.0,4.0.0)",
  org.eventb.core.ast;bundle-version="[3.0.0,4.0.0)",
  org.eventb.core.seqprover;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.osgi,
- org.rodinp.core;bundle-version="[1.7.0,2.0.0)",
- org.eventb.core;bundle-version="[3.0.0,4.0.0)",
- de.prob.ui;bundle-version="[7.5.0,7.6.0)"
+ org.eventb.ui;bundle-version="[3.0.0,4.0.0)",
+ org.rodinp.core;bundle-version="[1.7.0,2.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-ActivationPolicy: lazy
 Bundle-Localization: plugin
diff --git a/de.prob.symbolic/META-INF/MANIFEST.MF b/de.prob.symbolic/META-INF/MANIFEST.MF
index 323933e1d81428ae1ac27fe36f3df029712e54ad..1b713a2fa35c3f1b0db188f3a00564d1a813bb91 100644
--- a/de.prob.symbolic/META-INF/MANIFEST.MF
+++ b/de.prob.symbolic/META-INF/MANIFEST.MF
@@ -4,13 +4,13 @@ Bundle-Name: ProB Symbolic Evaluation Support
 Bundle-SymbolicName: de.prob.symbolic;singleton:=true
 Bundle-Version: 7.5.0.qualifier
 Bundle-Activator: de.prob.symbolic.Activator
-Require-Bundle: org.eclipse.core.runtime,
- de.prob.core;bundle-version="[9.5.0,9.6.0)",
- org.eventb.ui;bundle-version="[3.0.0,4.0.0)",
+Require-Bundle: de.prob.core;bundle-version="[9.5.0,9.6.0)",
  de.prob.ui;bundle-version="[7.5.0,7.6.0)",
- org.rodinp.core;bundle-version="[1.7.0,2.0.0)",
+ org.eclipse.core.runtime,
  org.eclipse.ui;bundle-version="[3.5.0,4.0.0)",
- org.eventb.core;bundle-version="[3.0.0,4.0.0)"
+ org.eventb.core;bundle-version="[3.0.0,4.0.0)",
+ org.eventb.ui;bundle-version="[3.0.0,4.0.0)",
+ org.rodinp.core;bundle-version="[1.7.0,2.0.0)"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-Vendor: HHU Düsseldorf STUPS Group
diff --git a/de.prob.ui/META-INF/MANIFEST.MF b/de.prob.ui/META-INF/MANIFEST.MF
index 50274b72a5ef88d16553c5f8e1d486a062306bff..4d6e92e0390654f8f9d0e57bbf4b6df75ef73ccd 100644
--- a/de.prob.ui/META-INF/MANIFEST.MF
+++ b/de.prob.ui/META-INF/MANIFEST.MF
@@ -3,14 +3,14 @@ Bundle-ManifestVersion: 2
 Bundle-Name: ProB Ui Plug-in
 Bundle-SymbolicName: de.prob.ui;singleton:=true
 Bundle-Version: 7.5.0.qualifier
-Require-Bundle: org.eclipse.ui;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
+Require-Bundle: de.prob.core;bundle-version="[9.5.0,9.6.0)",
+ org.eclipse.core.expressions;bundle-version="[3.4.101,4.0.0)",
  org.eclipse.core.resources;bundle-version="[3.5.0,4.0.0)",
+ org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
+ org.eclipse.gef;bundle-version="[3.7.0,4.0.0)",
+ org.eclipse.ui;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.ui.ide;bundle-version="[3.5.0,4.0.0)",
- de.prob.core;bundle-version="[9.5.0,9.6.0)",
  org.eventb.core;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.core.expressions;bundle-version="[3.4.101,4.0.0)",
- org.eclipse.gef;bundle-version="[3.7.0,4.0.0)",
  org.eventb.core.ast;bundle-version="[3.0.0,4.0.0)",
  org.rodinp.core;bundle-version="[1.7.0,2.0.0)"
 Bundle-ActivationPolicy: lazy
diff --git a/de.prob2.disprover.feature/feature.xml b/de.prob2.disprover.feature/feature.xml
index aa0604503c536daca2dbea7a300b7f782aba8ed1..47b50a2d99a32e95335e361349a8a4d74e4fcd48 100644
--- a/de.prob2.disprover.feature/feature.xml
+++ b/de.prob2.disprover.feature/feature.xml
@@ -228,17 +228,17 @@ litigation.
    </license>
 
    <requires>
-      <import plugin="org.eclipse.core.runtime" version="3.5.0" match="compatible"/>
       <import plugin="de.prob.core" version="9.5.0" match="equivalent"/>
-      <import plugin="org.eventb.core.seqprover" version="3.0.0"/>
-      <import plugin="org.eventb.core" version="3.0.0"/>
+      <import plugin="de.prob.eventb.disprover.core" version="2.1.0" match="equivalent"/>
+      <import plugin="de.prob.ui" version="7.5.0" match="equivalent"/>
+      <import plugin="org.eclipse.core.runtime" version="3.5.0" match="compatible"/>
+      <import plugin="org.eclipse.osgi"/>
       <import plugin="org.eclipse.ui" version="3.5.0" match="compatible"/>
+      <import plugin="org.eventb.core" version="3.0.0"/>
       <import plugin="org.eventb.core.ast" version="3.0.0"/>
-      <import plugin="org.rodinp.core" version="1.7.0" match="compatible"/>
+      <import plugin="org.eventb.core.seqprover" version="3.0.0"/>
       <import plugin="org.eventb.ui" version="3.0.0"/>
-      <import plugin="org.eclipse.osgi"/>
-      <import plugin="de.prob.ui" version="7.5.0" match="equivalent"/>
-      <import plugin="de.prob.eventb.disprover.core" version="2.1.0" match="equivalent"/>
+      <import plugin="org.rodinp.core" version="1.7.0" match="compatible"/>
    </requires>
 
    <plugin
diff --git a/de.prob2.feature/feature.xml b/de.prob2.feature/feature.xml
index 1c2d49b92016180808a4b616b4f308403168dc99..e26d508b2b7f94c7f9c63e5dee426259777f3841 100644
--- a/de.prob2.feature/feature.xml
+++ b/de.prob2.feature/feature.xml
@@ -228,25 +228,25 @@ litigation.
    </license>
 
    <requires>
-      <import plugin="org.eclipse.ui" version="3.5.0" match="compatible"/>
-      <import plugin="org.eclipse.ui.ide" version="3.5.0" match="compatible"/>
-      <import plugin="org.eclipse.core.runtime" version="3.5.0" match="compatible"/>
-      <import plugin="org.eclipse.gef" version="3.7.0" match="compatible"/>
+      <import plugin="de.bmotionstudio.gef.editor" version="5.6.0" match="equivalent"/>
       <import plugin="de.prob.core" version="9.5.0" match="equivalent"/>
-      <import plugin="org.eventb.core" version="3.0.0"/>
-      <import plugin="org.eclipse.core.resources" version="3.5.0" match="compatible"/>
-      <import plugin="org.rodinp.core" version="1.7.0" match="compatible"/>
-      <import plugin="org.eventb.core.ast" version="3.0.0"/>
-      <import plugin="org.eventb.core.seqprover" version="3.0.0"/>
       <import plugin="de.prob.ui" version="7.5.0" match="equivalent"/>
-      <import plugin="org.eclipse.core.expressions" version="3.4.101" match="compatible"/>
-      <import plugin="org.eclipse.ui.views" version="3.5.0" match="compatible"/>
       <import plugin="org.eclipse.core.databinding" version="1.2.0" match="compatible"/>
-      <import plugin="org.eclipse.jface.databinding" version="1.2.1" match="compatible"/>
       <import plugin="org.eclipse.core.databinding.beans" version="1.1.1" match="compatible"/>
+      <import plugin="org.eclipse.core.expressions" version="3.4.101" match="compatible"/>
+      <import plugin="org.eclipse.core.resources" version="3.5.0" match="compatible"/>
+      <import plugin="org.eclipse.core.runtime" version="3.5.0" match="compatible"/>
+      <import plugin="org.eclipse.gef" version="3.7.0" match="compatible"/>
       <import plugin="org.eclipse.help" version="3.5.100" match="compatible"/>
+      <import plugin="org.eclipse.jface.databinding" version="1.2.1" match="compatible"/>
+      <import plugin="org.eclipse.ui" version="3.5.0" match="compatible"/>
+      <import plugin="org.eclipse.ui.ide" version="3.5.0" match="compatible"/>
       <import plugin="org.eclipse.ui.navigator" version="3.5.0" match="compatible"/>
-      <import plugin="de.bmotionstudio.gef.editor" version="5.6.0" match="equivalent"/>
+      <import plugin="org.eclipse.ui.views" version="3.5.0" match="compatible"/>
+      <import plugin="org.eventb.core" version="3.0.0"/>
+      <import plugin="org.eventb.core.ast" version="3.0.0"/>
+      <import plugin="org.eventb.core.seqprover" version="3.0.0"/>
+      <import plugin="org.rodinp.core" version="1.7.0" match="compatible"/>
    </requires>
 
    <plugin
@@ -256,6 +256,14 @@ litigation.
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="de.bmotionstudio.rodin"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
    <plugin
          id="de.prob.core"
          download-size="0"
@@ -277,12 +285,4 @@ litigation.
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="de.bmotionstudio.rodin"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"
-         unpack="false"/>
-
 </feature>
diff --git a/de.prob2.symbolic.feature/feature.xml b/de.prob2.symbolic.feature/feature.xml
index 9cb7ea5c45fe62ba422882e108054fd184be0bbd..9bebe83b43a720efa88fa61a9f95fb817e2e38bf 100644
--- a/de.prob2.symbolic.feature/feature.xml
+++ b/de.prob2.symbolic.feature/feature.xml
@@ -228,13 +228,13 @@ litigation.
    </license>
 
    <requires>
-      <import plugin="org.eclipse.core.runtime"/>
       <import plugin="de.prob.core" version="9.5.0" match="equivalent"/>
       <import plugin="de.prob.ui" version="7.5.0" match="equivalent"/>
-      <import plugin="org.rodinp.core" version="1.7.0" match="compatible"/>
+      <import plugin="org.eclipse.core.runtime"/>
       <import plugin="org.eclipse.ui" version="3.5.0" match="compatible"/>
       <import plugin="org.eventb.core" version="3.0.0"/>
       <import plugin="org.eventb.ui" version="3.0.0"/>
+      <import plugin="org.rodinp.core" version="1.7.0" match="compatible"/>
    </requires>
 
    <plugin