diff --git a/build/com.mbeddr.allScripts/build.xml b/build/com.mbeddr.allScripts/build.xml
index 85acd676fbf..41951d3f1ed 100644
--- a/build/com.mbeddr.allScripts/build.xml
+++ b/build/com.mbeddr.allScripts/build.xml
@@ -357,7 +357,7 @@
   
   <target name="generate" depends="declare-mps-tasks, fetchDependencies">
     <echo message="generating" />
-    <generate strictMode="true" parallelMode="true" parallelThreads="4" useInplaceTransform="true" hideWarnings="false" fork="true" targetJavaVersion="1.6">
+    <generate strictMode="true" parallelMode="true" parallelThreads="4" useInplaceTransform="true" hideWarnings="false" createStaticRefs="false" fork="true" targetJavaVersion="1.6">
       <plugin path="${artifacts.mps}/plugins/mps-build" />
       <plugin path="${artifacts.mps}/plugins/mps-core/META-INF/plugin.xml/../.." />
       <plugin path="${artifacts.mps}/plugins/mps-debugger-api" />
diff --git a/code/languages/com.mbeddr.build/.mps/modules.xml b/code/languages/com.mbeddr.build/.mps/modules.xml
index 0c19f45eeaf..d709a2eb70c 100644
--- a/code/languages/com.mbeddr.build/.mps/modules.xml
+++ b/code/languages/com.mbeddr.build/.mps/modules.xml
@@ -2,7 +2,6 @@
 <project version="4">
   <component name="MPSProject">
     <projectModules>
-      <modulePath path="${mbeddr.github.core.home}/code/plugins/sl-all/solutions/de.slisson.mps.all.build/de.slisson.mps.all.build.msd" folder="" />
       <modulePath path="$PROJECT_DIR$/solutions/com.mbeddr.allInOne/allInOne.msd" folder="rcp" />
       <modulePath path="$PROJECT_DIR$/solutions/com.mbeddr.allScripts/com.mbeddr.allScripts.msd" folder="build.scripts" />
       <modulePath path="$PROJECT_DIR$/solutions/com.mbeddr.analyses.dev.build/build.msd" folder="analyses" />
@@ -18,6 +17,7 @@
       <modulePath path="$PROJECT_DIR$/solutions/com.mbeddr.rcp/com.mbeddr.rcp.msd" folder="rcp" />
       <modulePath path="$PROJECT_DIR$/solutions/jetbrains.mps.minimal/jetbrains.mps.minimal.msd" folder="rcp" />
       <modulePath path="$PROJECT_DIR$/tests/test.com.mbeddr.core.buildvalidation/test.com.mbeddr.mpsutil.build.msd" folder="build.test" />
+      <modulePath path="${sl-all}/solutions/de.slisson.mps.all.build/de.slisson.mps.all.build.msd" folder="" />
     </projectModules>
   </component>
 </project>
\ No newline at end of file
diff --git a/code/languages/com.mbeddr.build/solutions/com.mbeddr.build/models/com/mbeddr/build/build.mps b/code/languages/com.mbeddr.build/solutions/com.mbeddr.build/models/com/mbeddr/build/build.mps
index 412cf5abe6a..31ec4f78a65 100644
--- a/code/languages/com.mbeddr.build/solutions/com.mbeddr.build/models/com/mbeddr/build/build.mps
+++ b/code/languages/com.mbeddr.build/solutions/com.mbeddr.build/models/com/mbeddr/build/build.mps
@@ -515,8 +515,8 @@
       <node concept="m$_yC" id="7eF9rfAuv_5" role="m$_yJ">
         <ref role="m$_y1" node="5qO$P$Prhta" resolve="com.mbeddr.debugger" />
       </node>
-      <node concept="m$_yC" id="4hvHh3QXVwV" role="m$_yJ">
-        <ref role="m$_y1" to="90a9:6GHSnJozNgZ" resolve="de.itemis.mps.editor.bool" />
+      <node concept="m$_yC" id="3DmJHOpMhZ5" role="m$_yJ">
+        <ref role="m$_y1" to="90a9:7szUFELHeHf" resolve="de.itemis.mps.editor.widgets" />
       </node>
       <node concept="m$_yC" id="$bJ0jgF_4y" role="m$_yJ">
         <ref role="m$_y1" to="al5i:$bJ0jguQdg" resolve="com.mbeddr.platform" />
@@ -701,8 +701,8 @@
       <node concept="m$_yC" id="4hvHh3R1B$_" role="m$_yJ">
         <ref role="m$_y1" to="90a9:4p3FRivDLPy" resolve="org.apache.commons" />
       </node>
-      <node concept="m$_yC" id="4hvHh3R1BAS" role="m$_yJ">
-        <ref role="m$_y1" to="90a9:6GHSnJozNgZ" resolve="de.itemis.mps.editor.bool" />
+      <node concept="m$_yC" id="3DmJHOpMjKO" role="m$_yJ">
+        <ref role="m$_y1" to="90a9:7szUFELHeHf" resolve="de.itemis.mps.editor.widgets" />
       </node>
       <node concept="3_J27D" id="7eF9rfAuDVv" role="m_cZH">
         <node concept="3Mxwew" id="7eF9rfAuDVw" role="3MwsjC">
@@ -820,8 +820,8 @@
       <node concept="m$_yC" id="7eF9rfAuSOk" role="m$_yJ">
         <ref role="m$_y1" to="90a9:1sO539bGQvt" resolve="de.slisson.mps.richtext" />
       </node>
-      <node concept="m$_yC" id="4elbL$_XMz$" role="m$_yJ">
-        <ref role="m$_y1" to="90a9:6GHSnJozNgZ" resolve="de.itemis.mps.editor.bool" />
+      <node concept="m$_yC" id="3DmJHOpMkd6" role="m$_yJ">
+        <ref role="m$_y1" to="90a9:7szUFELHeHf" resolve="de.itemis.mps.editor.widgets" />
       </node>
       <node concept="m$_yC" id="$bJ0jgzU5s" role="m$_yJ">
         <ref role="m$_y1" to="al5i:$bJ0jguQdg" resolve="com.mbeddr.platform" />
diff --git a/code/languages/com.mbeddr.build/solutions/com.mbeddr.core.tests.performance.build/models/com/mbeddr/core/tests/performance/build/build.mps b/code/languages/com.mbeddr.build/solutions/com.mbeddr.core.tests.performance.build/models/com/mbeddr/core/tests/performance/build/build.mps
index 29a6078ccf9..9b332120fed 100644
--- a/code/languages/com.mbeddr.build/solutions/com.mbeddr.core.tests.performance.build/models/com/mbeddr/core/tests/performance/build/build.mps
+++ b/code/languages/com.mbeddr.build/solutions/com.mbeddr.core.tests.performance.build/models/com/mbeddr/core/tests/performance/build/build.mps
@@ -193,8 +193,8 @@
             <ref role="3bR37D" to="al5i:2bBLuwR9$cn" resolve="com.mbeddr.mpsutil.interpreter.rt" />
           </node>
         </node>
-        <node concept="1SiIV0" id="7OBQOW$cJ_s" role="3bR37C">
-          <node concept="3bR9La" id="7OBQOW$cJ_t" role="1SiIV1">
+        <node concept="1SiIV0" id="3evmF2I3eU$" role="3bR37C">
+          <node concept="3bR9La" id="3evmF2I3eU_" role="1SiIV1">
             <property role="3bR36h" value="false" />
             <ref role="3bR37D" to="p6ld:7uZw0yZ43L9" resolve="com.mbeddr.core.modules" />
           </node>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/compare.mpl b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/compare.mpl
index 5e73235cb6c..dd75ae52317 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/compare.mpl
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/compare.mpl
@@ -50,7 +50,6 @@
         <language id="a482b416-d0c9-473f-8f67-725ed642b3f3" fqName="com.mbeddr.mpsutil.breadcrumb" version="0" />
         <language id="f47b95d4-5e73-4c04-9204-18076950153b" fqName="com.mbeddr.mpsutil.compare" version="0" />
         <language id="d09a16fb-1d68-4a92-a5a4-20b4b2f86a62" fqName="com.mbeddr.mpsutil.jung" version="0" />
-        <language id="79685937-8b0a-4e7d-8f8c-0888f1581774" fqName="com.mbeddr.mpsutil.nodeviewer" version="0" />
         <language id="b4d28e19-7d2d-47e9-943e-3a41f97a0e52" fqName="com.mbeddr.mpsutil.plantuml.node" version="0" />
         <language id="92d2ea16-5a42-4fdf-a676-c7604efe3504" fqName="de.slisson.mps.richtext" version="0" />
         <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" fqName="jetbrains.mps.baseLanguage" version="1" />