diff --git a/fda.ui.module/src/main/java/ch/psi/fda/ui/cm/ConfigurationManagerTopComponent.form b/fda.ui.module/src/main/java/ch/psi/fda/ui/cm/ConfigurationManagerTopComponent.form
index 2dcc7e0..c402bda 100644
--- a/fda.ui.module/src/main/java/ch/psi/fda/ui/cm/ConfigurationManagerTopComponent.form
+++ b/fda.ui.module/src/main/java/ch/psi/fda/ui/cm/ConfigurationManagerTopComponent.form
@@ -1,4 +1,4 @@
-<?xml version="1.1" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
 
 <Form version="1.4" maxVersion="1.7" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
   <AuxValues>
diff --git a/fda.ui.module/src/main/resources/ch/psi/fda/ui/ee/CdumpExecutionTopComponentSettings.xml b/fda.ui.module/src/main/resources/ch/psi/fda/ui/ee/CdumpExecutionTopComponentSettings.xml
index e7bb811..e6224c1 100644
--- a/fda.ui.module/src/main/resources/ch/psi/fda/ui/ee/CdumpExecutionTopComponentSettings.xml
+++ b/fda.ui.module/src/main/resources/ch/psi/fda/ui/ee/CdumpExecutionTopComponentSettings.xml
@@ -17,7 +17,7 @@
 -->
 <!DOCTYPE settings PUBLIC "-//NetBeans//DTD Session settings 1.0//EN" "http://www.netbeans.org/dtds/sessionsettings-1_0.dtd">
 <settings version="1.0">
-    <module name="ch.psi.fda.ui.cdump" spec="1.0"/>
+    <module name="ch.psi.fda.ui.module" spec="1.0"/>
     <instanceof class="org.openide.windows.TopComponent"/>
     <instanceof class="ch.psi.fda.ui.cdump.CdumpExecutionTopComponent"/>
     <instance class="ch.psi.fda.ui.cdump.CdumpExecutionTopComponent" method="getDefault"/>
diff --git a/fda.ui.module/src/main/resources/ch/psi/fda/ui/ee/CdumpExecutionTopComponentWstcref.xml b/fda.ui.module/src/main/resources/ch/psi/fda/ui/ee/CdumpExecutionTopComponentWstcref.xml
index 0710242..7051952 100644
--- a/fda.ui.module/src/main/resources/ch/psi/fda/ui/ee/CdumpExecutionTopComponentWstcref.xml
+++ b/fda.ui.module/src/main/resources/ch/psi/fda/ui/ee/CdumpExecutionTopComponentWstcref.xml
@@ -17,7 +17,7 @@
 -->
 <!DOCTYPE tc-ref PUBLIC "-//NetBeans//DTD Top Component in Mode Properties 2.0//EN" "http://www.netbeans.org/dtds/tc-ref2_0.dtd">
 <tc-ref version="2.0" >
-    <module name="ch.psi.fda.ui.cdump" spec="1.0"/>
+    <module name="ch.psi.fda.ui.module" spec="1.0"/>
     <tc-id id="CdumpExecutionTopComponent"/>
     <state opened="false"/>
 </tc-ref>
diff --git a/fda.ui.module/src/main/resources/ch/psi/fda/ui/ee/ConfigurationManagerTopComponentSettings.xml b/fda.ui.module/src/main/resources/ch/psi/fda/ui/ee/ConfigurationManagerTopComponentSettings.xml
index 94eb3aa..35bd8a7 100644
--- a/fda.ui.module/src/main/resources/ch/psi/fda/ui/ee/ConfigurationManagerTopComponentSettings.xml
+++ b/fda.ui.module/src/main/resources/ch/psi/fda/ui/ee/ConfigurationManagerTopComponentSettings.xml
@@ -17,7 +17,7 @@
 -->
 <!DOCTYPE settings PUBLIC "-//NetBeans//DTD Session settings 1.0//EN" "http://www.netbeans.org/dtds/sessionsettings-1_0.dtd">
 <settings version="1.0">
-    <module name="ch.psi.fda.ui.cm" spec="1.0"/>
+    <module name="ch.psi.fda.ui.module" spec="1.0"/>
     <instanceof class="org.openide.windows.TopComponent"/>
     <instanceof class="ch.psi.fda.ui.cm.ConfigurationManagerTopComponent"/>
     <instance class="ch.psi.fda.ui.cm.ConfigurationManagerTopComponent" method="getDefault"/>
diff --git a/fda.ui.module/src/main/resources/ch/psi/fda/ui/ee/ConfigurationManagerTopComponentWstcref.xml b/fda.ui.module/src/main/resources/ch/psi/fda/ui/ee/ConfigurationManagerTopComponentWstcref.xml
index 20a91e8..058ecfe 100644
--- a/fda.ui.module/src/main/resources/ch/psi/fda/ui/ee/ConfigurationManagerTopComponentWstcref.xml
+++ b/fda.ui.module/src/main/resources/ch/psi/fda/ui/ee/ConfigurationManagerTopComponentWstcref.xml
@@ -17,7 +17,7 @@
 -->
 <!DOCTYPE tc-ref PUBLIC "-//NetBeans//DTD Top Component in Mode Properties 2.0//EN" "http://www.netbeans.org/dtds/tc-ref2_0.dtd">
 <tc-ref version="2.0" >
-    <module name="ch.psi.fda.ui.cm" spec="1.0"/>
+    <module name="ch.psi.fda.ui.module" spec="1.0"/>
     <tc-id id="ConfigurationManagerTopComponent"/>
     <state opened="true"/>
 </tc-ref>
diff --git a/fda.ui.module/src/main/resources/ch/psi/fda/ui/ee/DataManagerTopComponentSettings.xml b/fda.ui.module/src/main/resources/ch/psi/fda/ui/ee/DataManagerTopComponentSettings.xml
index 0f40d8b..7a29d13 100644
--- a/fda.ui.module/src/main/resources/ch/psi/fda/ui/ee/DataManagerTopComponentSettings.xml
+++ b/fda.ui.module/src/main/resources/ch/psi/fda/ui/ee/DataManagerTopComponentSettings.xml
@@ -17,7 +17,7 @@
 -->
 <!DOCTYPE settings PUBLIC "-//NetBeans//DTD Session settings 1.0//EN" "http://www.netbeans.org/dtds/sessionsettings-1_0.dtd">
 <settings version="1.0">
-    <module name="ch.psi.fda.ui.cm" spec="1.0"/>
+    <module name="ch.psi.fda.ui.module" spec="1.0"/>
     <instanceof class="org.openide.windows.TopComponent"/>
     <instanceof class="ch.psi.fda.ui.cm.DataManagerTopComponent"/>
     <instance class="ch.psi.fda.ui.cm.DataManagerTopComponent" method="getDefault"/>
diff --git a/fda.ui.module/src/main/resources/ch/psi/fda/ui/ee/DataManagerTopComponentWstcref.xml b/fda.ui.module/src/main/resources/ch/psi/fda/ui/ee/DataManagerTopComponentWstcref.xml
index 06f8b44..79bb1a9 100644
--- a/fda.ui.module/src/main/resources/ch/psi/fda/ui/ee/DataManagerTopComponentWstcref.xml
+++ b/fda.ui.module/src/main/resources/ch/psi/fda/ui/ee/DataManagerTopComponentWstcref.xml
@@ -17,7 +17,7 @@
 -->
 <!DOCTYPE tc-ref PUBLIC "-//NetBeans//DTD Top Component in Mode Properties 2.0//EN" "http://www.netbeans.org/dtds/tc-ref2_0.dtd">
 <tc-ref version="2.0" >
-    <module name="ch.psi.fda.ui.cm" spec="1.0"/>
+    <module name="ch.psi.fda.ui.module" spec="1.0"/>
     <tc-id id="DataManagerTopComponent"/>
     <state opened="true"/>
 </tc-ref>
diff --git a/fda.ui.module/src/main/resources/ch/psi/fda/ui/ee/PlotVisualizerTopComponentSettings.xml b/fda.ui.module/src/main/resources/ch/psi/fda/ui/ee/PlotVisualizerTopComponentSettings.xml
index ee40f84..4b2f908 100644
--- a/fda.ui.module/src/main/resources/ch/psi/fda/ui/ee/PlotVisualizerTopComponentSettings.xml
+++ b/fda.ui.module/src/main/resources/ch/psi/fda/ui/ee/PlotVisualizerTopComponentSettings.xml
@@ -17,7 +17,7 @@
 -->
 <!DOCTYPE settings PUBLIC "-//NetBeans//DTD Session settings 1.0//EN" "http://www.netbeans.org/dtds/sessionsettings-1_0.dtd">
 <settings version="1.0">
-    <module name="ch.psi.fda.ui.ee" spec="1.0"/>
+    <module name="ch.psi.fda.ui.module" spec="1.0"/>
     <instanceof class="org.openide.windows.TopComponent"/>
     <instanceof class="ch.psi.fda.ui.ee.PlotVisualizerTopComponent"/>
     <instance class="ch.psi.fda.ui.ee.PlotVisualizerTopComponent" method="getDefault"/>
diff --git a/fda.ui.module/src/main/resources/ch/psi/fda/ui/ee/PlotVisualizerTopComponentWstcref.xml b/fda.ui.module/src/main/resources/ch/psi/fda/ui/ee/PlotVisualizerTopComponentWstcref.xml
index 628e9e9..39e5540 100644
--- a/fda.ui.module/src/main/resources/ch/psi/fda/ui/ee/PlotVisualizerTopComponentWstcref.xml
+++ b/fda.ui.module/src/main/resources/ch/psi/fda/ui/ee/PlotVisualizerTopComponentWstcref.xml
@@ -17,7 +17,7 @@
 -->
 <!DOCTYPE tc-ref PUBLIC "-//NetBeans//DTD Top Component in Mode Properties 2.0//EN" "http://www.netbeans.org/dtds/tc-ref2_0.dtd">
 <tc-ref version="2.0" >
-    <module name="ch.psi.fda.ui.ee" spec="1.0"/>
+    <module name="ch.psi.fda.ui.module" spec="1.0"/>
     <tc-id id="PlotVisualizerTopComponent"/>
     <state opened="false"/>
 </tc-ref>
diff --git a/fda.ui.module/src/main/resources/ch/psi/fda/ui/ee/VisualEditorTopComponentSettings.xml b/fda.ui.module/src/main/resources/ch/psi/fda/ui/ee/VisualEditorTopComponentSettings.xml
index 0df6617..445428c 100644
--- a/fda.ui.module/src/main/resources/ch/psi/fda/ui/ee/VisualEditorTopComponentSettings.xml
+++ b/fda.ui.module/src/main/resources/ch/psi/fda/ui/ee/VisualEditorTopComponentSettings.xml
@@ -17,7 +17,7 @@
 -->
 <!DOCTYPE settings PUBLIC "-//NetBeans//DTD Session settings 1.0//EN" "http://www.netbeans.org/dtds/sessionsettings-1_0.dtd">
 <settings version="1.0">
-    <module name="ch.psi.fda.ui.ce" spec="1.0"/>
+    <module name="ch.psi.fda.ui.module" spec="1.0"/>
     <instanceof class="org.openide.windows.TopComponent"/>
     <instanceof class="ch.psi.fda.ui.ce.VisualEditorTopComponent"/>
     <instance class="ch.psi.fda.ui.ce.VisualEditorTopComponent" method="getDefault"/>
diff --git a/fda.ui.module/src/main/resources/ch/psi/fda/ui/ee/VisualEditorTopComponentWstcref.xml b/fda.ui.module/src/main/resources/ch/psi/fda/ui/ee/VisualEditorTopComponentWstcref.xml
index 581e6eb..9aecd36 100644
--- a/fda.ui.module/src/main/resources/ch/psi/fda/ui/ee/VisualEditorTopComponentWstcref.xml
+++ b/fda.ui.module/src/main/resources/ch/psi/fda/ui/ee/VisualEditorTopComponentWstcref.xml
@@ -17,7 +17,7 @@
 -->
 <!DOCTYPE tc-ref PUBLIC "-//NetBeans//DTD Top Component in Mode Properties 2.0//EN" "http://www.netbeans.org/dtds/tc-ref2_0.dtd">
 <tc-ref version="2.0" >
-    <module name="ch.psi.fda.ui.ce" spec="1.0"/>
+    <module name="ch.psi.fda.ui.module" spec="1.0"/>
     <tc-id id="VisualEditorTopComponent"/>
     <state opened="false"/>
 </tc-ref>