diff --git a/bt5/erp5_configurator_ung/PathTemplateItem/business_configuration_module/ung_configuration.xml b/bt5/erp5_configurator_ung/PathTemplateItem/business_configuration_module/ung_configuration.xml
index 5380c1873b2d4e3dff16e4099dcf4ecb02e0ed3d..5c24d1cb1fbef467dc3c103c6fd98bba47e489d1 100644
--- a/bt5/erp5_configurator_ung/PathTemplateItem/business_configuration_module/ung_configuration.xml
+++ b/bt5/erp5_configurator_ung/PathTemplateItem/business_configuration_module/ung_configuration.xml
@@ -66,6 +66,12 @@
               <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
             </value>
         </item>
+        <item>
+            <key> <string>_global_configuration_attributes</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+            </value>
+        </item>
         <item>
             <key> <string>_local_properties</string> </key>
             <value>
@@ -96,7 +102,13 @@
         <item>
             <key> <string>_mt_index</string> </key>
             <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+              <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>_multi_entry_transitions</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAU=</string> </persistent>
             </value>
         </item>
         <item>
@@ -108,14 +120,15 @@
         <item>
             <key> <string>_tree</string> </key>
             <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
+              <persistent> <string encoding="base64">AAAAAAAAAAY=</string> </persistent>
             </value>
         </item>
         <item>
             <key> <string>categories</string> </key>
             <value>
               <tuple>
-                <string>resource/portal_workflow/workflow_ung_configuration_workflow</string>
+                <string>resource/portal_workflow/ung_configuration_workflow</string>
+                <string>current_state/portal_workflow/ung_configuration_workflow/7</string>
               </tuple>
             </value>
         </item>
@@ -207,6 +220,40 @@
     <pickle> <int>0</int> </pickle>
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>company_email</string> </key>
+                    <value>
+                      <none/>
+                    </value>
+                </item>
+                <item>
+                    <key> <string>default_available_language</string> </key>
+                    <value> <string>en</string> </value>
+                </item>
+                <item>
+                    <key> <string>organisation_configurator_item</string> </key>
+                    <value> <string>business_configuration_module/ung_configuration/3/1</string> </value>
+                </item>
+                <item>
+                    <key> <string>user_number</string> </key>
+                    <value> <int>1</int> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
       <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
@@ -214,7 +261,27 @@
       <none/>
     </pickle>
   </record>
-  <record id="4" aka="AAAAAAAAAAQ=">
+  <record id="5" aka="AAAAAAAAAAU=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>portal_workflow/ung_configuration_workflow/10</string> </key>
+                    <value> <int>0</int> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="6" aka="AAAAAAAAAAY=">
     <pickle>
       <global name="OOBTree" module="BTrees.OOBTree"/>
     </pickle>
diff --git a/bt5/erp5_configurator_ung/PathTemplateItem/workflow_module/ung_configuration_workflow.xml b/bt5/erp5_configurator_ung/PathTemplateItem/workflow_module/ung_configuration_workflow.xml
index 08ab2ea918938a763a4fc8885ef5aeda6a242475..e95e4886aafbd8b14ccb3629cb7102d6933f1d32 100644
--- a/bt5/erp5_configurator_ung/PathTemplateItem/workflow_module/ung_configuration_workflow.xml
+++ b/bt5/erp5_configurator_ung/PathTemplateItem/workflow_module/ung_configuration_workflow.xml
@@ -79,6 +79,10 @@
             <key> <string>portal_type</string> </key>
             <value> <string>Workflow</string> </value>
         </item>
+        <item>
+            <key> <string>ref</string> </key>
+            <value> <string>ung_configuration_workflow</string> </value>
+        </item>
         <item>
             <key> <string>state_base_category</string> </key>
             <value> <string>current_state</string> </value>
diff --git a/bt5/erp5_configurator_ung/SkinTemplateItem/portal_skins/erp5_configurator_ung/BusinessConfiguration_displayUNGDownloadForm.xml b/bt5/erp5_configurator_ung/SkinTemplateItem/portal_skins/erp5_configurator_ung/BusinessConfiguration_displayUNGDownloadForm.xml
index 4520309ca8ded0884653e2453e87b8873f4bd616..8fed11d3064ef2185d521cc3843e33c861c36b60 100644
--- a/bt5/erp5_configurator_ung/SkinTemplateItem/portal_skins/erp5_configurator_ung/BusinessConfiguration_displayUNGDownloadForm.xml
+++ b/bt5/erp5_configurator_ung/SkinTemplateItem/portal_skins/erp5_configurator_ung/BusinessConfiguration_displayUNGDownloadForm.xml
@@ -2,7 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+      <global name="ERP5 Form" module="erp5.portal_type"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_configurator_ung/SkinTemplateItem/portal_skins/erp5_configurator_ung/BusinessConfiguration_setupUNGOrganisationForm.xml b/bt5/erp5_configurator_ung/SkinTemplateItem/portal_skins/erp5_configurator_ung/BusinessConfiguration_setupUNGOrganisationForm.xml
index 1adbfd6bc2ec599749fabf31a1d0252469b02954..8c3677cb648d44984ef06fe88bed23674c624bc5 100644
--- a/bt5/erp5_configurator_ung/SkinTemplateItem/portal_skins/erp5_configurator_ung/BusinessConfiguration_setupUNGOrganisationForm.xml
+++ b/bt5/erp5_configurator_ung/SkinTemplateItem/portal_skins/erp5_configurator_ung/BusinessConfiguration_setupUNGOrganisationForm.xml
@@ -2,7 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+      <global name="ERP5 Form" module="erp5.portal_type"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_configurator_ung/SkinTemplateItem/portal_skins/erp5_configurator_ung/BusinessConfiguration_setupUNGPreferencesForm.xml b/bt5/erp5_configurator_ung/SkinTemplateItem/portal_skins/erp5_configurator_ung/BusinessConfiguration_setupUNGPreferencesForm.xml
index c2722a30eb249fab709f3660f5d2e3192f8951d8..074b3ddfed3712ab562b7f48c6b96a922ecac955 100644
--- a/bt5/erp5_configurator_ung/SkinTemplateItem/portal_skins/erp5_configurator_ung/BusinessConfiguration_setupUNGPreferencesForm.xml
+++ b/bt5/erp5_configurator_ung/SkinTemplateItem/portal_skins/erp5_configurator_ung/BusinessConfiguration_setupUNGPreferencesForm.xml
@@ -2,7 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+      <global name="ERP5 Form" module="erp5.portal_type"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_configurator_ung/SkinTemplateItem/portal_skins/erp5_configurator_ung/BusinessConfiguration_setupUNGUserListForm.xml b/bt5/erp5_configurator_ung/SkinTemplateItem/portal_skins/erp5_configurator_ung/BusinessConfiguration_setupUNGUserListForm.xml
index bbd670cdc23bf21b69959233047fdb0e2199c68e..24ad7a10bc88c9c9909ca6946c9eb1a7322211c3 100644
--- a/bt5/erp5_configurator_ung/SkinTemplateItem/portal_skins/erp5_configurator_ung/BusinessConfiguration_setupUNGUserListForm.xml
+++ b/bt5/erp5_configurator_ung/SkinTemplateItem/portal_skins/erp5_configurator_ung/BusinessConfiguration_setupUNGUserListForm.xml
@@ -2,7 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+      <global name="ERP5 Form" module="erp5.portal_type"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_configurator_ung/SkinTemplateItem/portal_skins/erp5_configurator_ung/BusinessConfiguration_setupUNGUserNumberForm.xml b/bt5/erp5_configurator_ung/SkinTemplateItem/portal_skins/erp5_configurator_ung/BusinessConfiguration_setupUNGUserNumberForm.xml
index 221d986c7ba7e6f5af2f57436f5893e6dde1d2dd..adca343c45410632dbece040b00ec0cfb11ff190 100644
--- a/bt5/erp5_configurator_ung/SkinTemplateItem/portal_skins/erp5_configurator_ung/BusinessConfiguration_setupUNGUserNumberForm.xml
+++ b/bt5/erp5_configurator_ung/SkinTemplateItem/portal_skins/erp5_configurator_ung/BusinessConfiguration_setupUNGUserNumberForm.xml
@@ -2,7 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+      <global name="ERP5 Form" module="erp5.portal_type"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_configurator_ung/TestTemplateItem/portal_components/test.erp5.testUNGConfigurationWorkflow.py b/bt5/erp5_configurator_ung/TestTemplateItem/portal_components/test.erp5.testUNGConfigurationWorkflow.py
index a098662e424e3f115ac325f6a6f46a7661de56ef..ac94ed622d5600c7138987a5aba7941aabfac605 100644
--- a/bt5/erp5_configurator_ung/TestTemplateItem/portal_components/test.erp5.testUNGConfigurationWorkflow.py
+++ b/bt5/erp5_configurator_ung/TestTemplateItem/portal_components/test.erp5.testUNGConfigurationWorkflow.py
@@ -37,6 +37,7 @@ class TestUNGConfiguratorWorkflowMixin(TestLiveConfiguratorWorkflowMixin):
 
   standard_bt5_list = ('erp5_ingestion_mysql_innodb_catalog',
                        'erp5_simulation',
+                       'erp5_workflow',
                        'erp5_dhtml_style',
                        'erp5_jquery',
                        'erp5_jquery_ui',
@@ -183,26 +184,26 @@ class TestUNGConfiguratorWorkflowMixin(TestLiveConfiguratorWorkflowMixin):
     sequence.edit(next_dict=next_dict)
 
   def stepCheckMultipleUserAccountThreeBrazil(self, sequence=None, sequence_list=None, **kw):
-     """ Check if the users were created correctly """
-     business_configuration = sequence.get("business_configuration")
-     person_config_save = business_configuration["5"]
-     person_config_item = person_config_save["1"]
-     self.assertEqual(person_config_item.getReference(), "person_creator")
-     person_config_item = person_config_save["2"]
-     self.assertEqual(person_config_item.getReference(), "person_assignee")
-     person_config_item = person_config_save["3"]
-     self.assertEqual(person_config_item.getReference(), "person_assignor")
+    """ Check if the users were created correctly """
+    business_configuration = sequence.get("business_configuration")
+    person_config_save = business_configuration["5"]
+    person_config_item = person_config_save["1"]
+    self.assertEqual(person_config_item.getReference(), "person_creator")
+    person_config_item = person_config_save["2"]
+    self.assertEqual(person_config_item.getReference(), "person_assignee")
+    person_config_item = person_config_save["3"]
+    self.assertEqual(person_config_item.getReference(), "person_assignor")
 
   def stepCheckMultipleUserAccountThreeFrance(self, sequence=None, sequence_list=None, **kw):
-     """ Check if the users were created correctly """
-     business_configuration = sequence.get("business_configuration")
-     person_config_save = business_configuration["5"]
-     person_config_item = person_config_save["1"]
-     self.assertEqual(person_config_item.getReference(), "french_creator")
-     person_config_item = person_config_save["2"]
-     self.assertEqual(person_config_item.getReference(), "french_assignee")
-     person_config_item = person_config_save["3"]
-     self.assertEqual(person_config_item.getReference(), "french_assignor")
+    """ Check if the users were created correctly """
+    business_configuration = sequence.get("business_configuration")
+    person_config_save = business_configuration["5"]
+    person_config_item = person_config_save["1"]
+    self.assertEqual(person_config_item.getReference(), "french_creator")
+    person_config_item = person_config_save["2"]
+    self.assertEqual(person_config_item.getReference(), "french_assignee")
+    person_config_item = person_config_save["3"]
+    self.assertEqual(person_config_item.getReference(), "french_assignor")
 
   def stepCheckConfigureInstallationForm(self, sequence=None, sequence_list=None, **kw):
     """ Check the installation form """
diff --git a/bt5/erp5_configurator_ung/TestTemplateItem/portal_components/test.erp5.testUNGConfigurationWorkflow.xml b/bt5/erp5_configurator_ung/TestTemplateItem/portal_components/test.erp5.testUNGConfigurationWorkflow.xml
index f46bfb4aa3bc6f934ceb4cbbb759e4eb3f77a713..5c8a29f11096544744ff6967b8fc2da5df888aa6 100644
--- a/bt5/erp5_configurator_ung/TestTemplateItem/portal_components/test.erp5.testUNGConfigurationWorkflow.xml
+++ b/bt5/erp5_configurator_ung/TestTemplateItem/portal_components/test.erp5.testUNGConfigurationWorkflow.xml
@@ -45,26 +45,7 @@
         <item>
             <key> <string>text_content_warning_message</string> </key>
             <value>
-              <tuple>
-                <string>W:186,  0: Bad indentation. Found 5 spaces, expected 4 (bad-indentation)</string>
-                <string>W:187,  0: Bad indentation. Found 5 spaces, expected 4 (bad-indentation)</string>
-                <string>W:188,  0: Bad indentation. Found 5 spaces, expected 4 (bad-indentation)</string>
-                <string>W:189,  0: Bad indentation. Found 5 spaces, expected 4 (bad-indentation)</string>
-                <string>W:190,  0: Bad indentation. Found 5 spaces, expected 4 (bad-indentation)</string>
-                <string>W:191,  0: Bad indentation. Found 5 spaces, expected 4 (bad-indentation)</string>
-                <string>W:192,  0: Bad indentation. Found 5 spaces, expected 4 (bad-indentation)</string>
-                <string>W:193,  0: Bad indentation. Found 5 spaces, expected 4 (bad-indentation)</string>
-                <string>W:194,  0: Bad indentation. Found 5 spaces, expected 4 (bad-indentation)</string>
-                <string>W:197,  0: Bad indentation. Found 5 spaces, expected 4 (bad-indentation)</string>
-                <string>W:198,  0: Bad indentation. Found 5 spaces, expected 4 (bad-indentation)</string>
-                <string>W:199,  0: Bad indentation. Found 5 spaces, expected 4 (bad-indentation)</string>
-                <string>W:200,  0: Bad indentation. Found 5 spaces, expected 4 (bad-indentation)</string>
-                <string>W:201,  0: Bad indentation. Found 5 spaces, expected 4 (bad-indentation)</string>
-                <string>W:202,  0: Bad indentation. Found 5 spaces, expected 4 (bad-indentation)</string>
-                <string>W:203,  0: Bad indentation. Found 5 spaces, expected 4 (bad-indentation)</string>
-                <string>W:204,  0: Bad indentation. Found 5 spaces, expected 4 (bad-indentation)</string>
-                <string>W:205,  0: Bad indentation. Found 5 spaces, expected 4 (bad-indentation)</string>
-              </tuple>
+              <tuple/>
             </value>
         </item>
         <item>
diff --git a/bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/workflow_ung_configuration_workflow.xml b/bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/ung_configuration_workflow.xml
similarity index 77%
rename from bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/workflow_ung_configuration_workflow.xml
rename to bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/ung_configuration_workflow.xml
index 9c361ef202994d6cbcb136800668ee50b275fc44..76955034b68e202d68b6a8ca990295c2a0ad79f5 100644
--- a/bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/workflow_ung_configuration_workflow.xml
+++ b/bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/ung_configuration_workflow.xml
@@ -2,7 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <global name="Workflow" module="erp5.portal_type"/>
+      <global name="Configuration Workflow" module="erp5.portal_type"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -26,6 +26,16 @@
                       <value> <string>string</string> </value>
                   </item>
                 </dictionary>
+                <dictionary>
+                  <item>
+                      <key> <string>id</string> </key>
+                      <value> <string>state_base_category</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>type</string> </key>
+                      <value> <string>lines</string> </value>
+                  </item>
+                </dictionary>
               </tuple>
             </value>
         </item>
@@ -45,7 +55,7 @@
             <key> <string>categories</string> </key>
             <value>
               <tuple>
-                <string>source/portal_workflow/workflow_ung_configuration_workflow/state_start</string>
+                <string>source/portal_workflow/ung_configuration_workflow/1</string>
               </tuple>
             </value>
         </item>
@@ -57,36 +67,21 @@
             <key> <string>configuration_after_script_id</string> </key>
             <value> <string>BusinessConfiguration_afterUNGConfiguration</string> </value>
         </item>
-        <item>
-            <key> <string>default_reference</string> </key>
-            <value> <string>ung_configuration_workflow</string> </value>
-        </item>
         <item>
             <key> <string>description</string> </key>
             <value> <string>The UNG project aims at building a complete alternative to proprietary business model and technologies, starting from enterprise application and ending with Internet search engine.</string> </value>
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>workflow_ung_configuration_workflow</string> </value>
-        </item>
-        <item>
-            <key> <string>managed_permission_list</string> </key>
-            <value>
-              <tuple>
-                <string>Access contents information</string>
-                <string>Add portal content</string>
-                <string>Modify portal content</string>
-                <string>View</string>
-              </tuple>
-            </value>
+            <value> <string>ung_configuration_workflow</string> </value>
         </item>
         <item>
             <key> <string>portal_type</string> </key>
-            <value> <string>Workflow</string> </value>
+            <value> <string>Configuration Workflow</string> </value>
         </item>
         <item>
-            <key> <string>state_variable</string> </key>
-            <value> <string>validation_state</string> </value>
+            <key> <string>state_base_category</string> </key>
+            <value> <string>current_state</string> </value>
         </item>
         <item>
             <key> <string>title</string> </key>
diff --git a/bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/workflow_ung_configuration_workflow/state_start.xml b/bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/ung_configuration_workflow/1.xml
similarity index 64%
rename from bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/workflow_ung_configuration_workflow/state_start.xml
rename to bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/ung_configuration_workflow/1.xml
index bf9fb854b758ee54f28a2feca594d52ccf1a4f90..03ff754d35facb2c043ca5ea22d09dc45090b2c6 100644
--- a/bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/workflow_ung_configuration_workflow/state_start.xml
+++ b/bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/ung_configuration_workflow/1.xml
@@ -2,7 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <global name="State" module="erp5.portal_type"/>
+      <global name="Configuration State" module="erp5.portal_type"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -10,14 +10,10 @@
             <key> <string>categories</string> </key>
             <value>
               <tuple>
-                <string>destination/portal_workflow/workflow_ung_configuration_workflow/transition_setup_standard_bt5</string>
+                <string>destination/portal_workflow/ung_configuration_workflow/16</string>
               </tuple>
             </value>
         </item>
-        <item>
-            <key> <string>default_reference</string> </key>
-            <value> <string>start</string> </value>
-        </item>
         <item>
             <key> <string>description</string> </key>
             <value>
@@ -26,11 +22,11 @@
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>state_start</string> </value>
+            <value> <string>1</string> </value>
         </item>
         <item>
             <key> <string>portal_type</string> </key>
-            <value> <string>State</string> </value>
+            <value> <string>Configuration State</string> </value>
         </item>
         <item>
             <key> <string>title</string> </key>
diff --git a/bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/ung_configuration_workflow/10.xml b/bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/ung_configuration_workflow/10.xml
new file mode 100644
index 0000000000000000000000000000000000000000..e05ab6a6a9852ff754b6ccbdcdc8dd7b00058983
--- /dev/null
+++ b/bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/ung_configuration_workflow/10.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Configuration Transition" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>after_script_id</string> </key>
+            <value>
+              <tuple>
+                <string>BusinessConfiguration_setupUNGList</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>categories</string> </key>
+            <value>
+              <tuple>
+                <string>destination/portal_workflow/ung_configuration_workflow/9</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>10</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Configuration Transition</string> </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>Configure user accounts</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/ung_configuration_workflow/11.xml b/bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/ung_configuration_workflow/11.xml
new file mode 100644
index 0000000000000000000000000000000000000000..35c483a51cedde3cf1a71833ea468cdaba3125b0
--- /dev/null
+++ b/bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/ung_configuration_workflow/11.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Configuration Transition" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>categories</string> </key>
+            <value>
+              <tuple>
+                <string>destination/portal_workflow/ung_configuration_workflow/2</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>11</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Configuration Transition</string> </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>Install</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/ung_configuration_workflow/12.xml b/bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/ung_configuration_workflow/12.xml
new file mode 100644
index 0000000000000000000000000000000000000000..5adfd98d837aa353b7f954affd3e2af2d8325f58
--- /dev/null
+++ b/bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/ung_configuration_workflow/12.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Configuration Transition" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>after_script_id</string> </key>
+            <value>
+              <tuple>
+                <string>BusinessConfiguration_setupCustomerBT5</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>categories</string> </key>
+            <value>
+              <tuple>
+                <string>destination/portal_workflow/ung_configuration_workflow/3</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>12</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Configuration Transition</string> </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>Setup customer BT5</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/ung_configuration_workflow/14.xml b/bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/ung_configuration_workflow/14.xml
new file mode 100644
index 0000000000000000000000000000000000000000..2ed5a384128a846a656294527328cd18547209db
--- /dev/null
+++ b/bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/ung_configuration_workflow/14.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Configuration Transition" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>after_script_id</string> </key>
+            <value>
+              <tuple>
+                <string>BusinessConfiguration_setupUNGPreferences</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>categories</string> </key>
+            <value>
+              <tuple>
+                <string>destination/portal_workflow/ung_configuration_workflow/4</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>14</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Configuration Transition</string> </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>Configure ERP5 Preferences</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/ung_configuration_workflow/15.xml b/bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/ung_configuration_workflow/15.xml
new file mode 100644
index 0000000000000000000000000000000000000000..d611287467f86e73578d7708092d5e720873ce84
--- /dev/null
+++ b/bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/ung_configuration_workflow/15.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Configuration Transition" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>after_script_id</string> </key>
+            <value>
+              <tuple>
+                <string>BusinessConfiguration_setupUNGOrganisation</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>categories</string> </key>
+            <value>
+              <tuple>
+                <string>destination/portal_workflow/ung_configuration_workflow/8</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>15</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Configuration Transition</string> </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>Configure Organisation</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/ung_configuration_workflow/16.xml b/bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/ung_configuration_workflow/16.xml
new file mode 100644
index 0000000000000000000000000000000000000000..14cdecebd7c5072851a5dda6ec4858206f2cf0bb
--- /dev/null
+++ b/bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/ung_configuration_workflow/16.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Configuration Transition" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>after_script_id</string> </key>
+            <value>
+              <tuple>
+                <string>BusinessConfiguration_setupUNGStandardBT5</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>categories</string> </key>
+            <value>
+              <tuple>
+                <string>destination/portal_workflow/ung_configuration_workflow/5</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>16</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Configuration Transition</string> </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>Setup standard BT5</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/ung_configuration_workflow/17.xml b/bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/ung_configuration_workflow/17.xml
new file mode 100644
index 0000000000000000000000000000000000000000..a58243cdfab1913c86a37103caa33565e865a72b
--- /dev/null
+++ b/bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/ung_configuration_workflow/17.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Configuration Transition" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>after_script_id</string> </key>
+            <value>
+              <tuple>
+                <string>BusinessConfiguration_setupUNGUserNumber</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>categories</string> </key>
+            <value>
+              <tuple>
+                <string>destination/portal_workflow/ung_configuration_workflow/6</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>17</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Configuration Transition</string> </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>Configure user accounts number</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/ung_configuration_workflow/18.xml b/bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/ung_configuration_workflow/18.xml
new file mode 100644
index 0000000000000000000000000000000000000000..a45db173517d16148342e3710f1dfd33e054d21c
--- /dev/null
+++ b/bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/ung_configuration_workflow/18.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Configuration Transition" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>categories</string> </key>
+            <value>
+              <tuple>
+                <string>destination/portal_workflow/ung_configuration_workflow/7</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>18</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Configuration Transition</string> </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>Finalize</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/workflow_ung_configuration_workflow/state_download.xml b/bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/ung_configuration_workflow/2.xml
similarity index 59%
rename from bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/workflow_ung_configuration_workflow/state_download.xml
rename to bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/ung_configuration_workflow/2.xml
index c76b787ad18a35a4c8597bab73211bfb2baf9c92..0b6ca778fa902bae6f36f3e9628cbd7faccb1535 100644
--- a/bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/workflow_ung_configuration_workflow/state_download.xml
+++ b/bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/ung_configuration_workflow/2.xml
@@ -2,7 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <global name="State" module="erp5.portal_type"/>
+      <global name="Configuration State" module="erp5.portal_type"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -10,25 +10,21 @@
             <key> <string>categories</string> </key>
             <value>
               <tuple>
-                <string>destination/portal_workflow/workflow_ung_configuration_workflow/transition_finalize</string>
+                <string>destination/portal_workflow/ung_configuration_workflow/18</string>
               </tuple>
             </value>
         </item>
-        <item>
-            <key> <string>default_reference</string> </key>
-            <value> <string>download</string> </value>
-        </item>
         <item>
             <key> <string>description</string> </key>
-            <value> <string>Installation procedure may begin.</string> </value>
+            <value> <string>Enter the data of each user</string> </value>
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>state_download</string> </value>
+            <value> <string>2</string> </value>
         </item>
         <item>
             <key> <string>portal_type</string> </key>
-            <value> <string>State</string> </value>
+            <value> <string>Configuration State</string> </value>
         </item>
         <item>
             <key> <string>title</string> </key>
diff --git a/bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/workflow_ung_configuration_workflow/state_customer_bt.xml b/bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/ung_configuration_workflow/3.xml
similarity index 64%
rename from bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/workflow_ung_configuration_workflow/state_customer_bt.xml
rename to bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/ung_configuration_workflow/3.xml
index 1220102eeb290ff3199a69558cffd96f9b343dad..6a5a57661a4995ddece41ad716f29acb47364acf 100644
--- a/bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/workflow_ung_configuration_workflow/state_customer_bt.xml
+++ b/bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/ung_configuration_workflow/3.xml
@@ -2,7 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <global name="State" module="erp5.portal_type"/>
+      <global name="Configuration State" module="erp5.portal_type"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -10,14 +10,10 @@
             <key> <string>categories</string> </key>
             <value>
               <tuple>
-                <string>destination/portal_workflow/workflow_ung_configuration_workflow/transition_configure_organisation</string>
+                <string>destination/portal_workflow/ung_configuration_workflow/15</string>
               </tuple>
             </value>
         </item>
-        <item>
-            <key> <string>default_reference</string> </key>
-            <value> <string>customer_bt</string> </value>
-        </item>
         <item>
             <key> <string>description</string> </key>
             <value>
@@ -26,11 +22,11 @@
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>state_customer_bt</string> </value>
+            <value> <string>3</string> </value>
         </item>
         <item>
             <key> <string>portal_type</string> </key>
-            <value> <string>State</string> </value>
+            <value> <string>Configuration State</string> </value>
         </item>
         <item>
             <key> <string>title</string> </key>
diff --git a/bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/workflow_ung_configuration_workflow/state_ung_preferences.xml b/bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/ung_configuration_workflow/4.xml
similarity index 65%
rename from bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/workflow_ung_configuration_workflow/state_ung_preferences.xml
rename to bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/ung_configuration_workflow/4.xml
index dfe968f76709965bcb3bdb6f5fd4d042d5221384..30a30e40e912814ade300625907c71e925c69b5c 100644
--- a/bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/workflow_ung_configuration_workflow/state_ung_preferences.xml
+++ b/bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/ung_configuration_workflow/4.xml
@@ -2,7 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <global name="State" module="erp5.portal_type"/>
+      <global name="Configuration State" module="erp5.portal_type"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -10,25 +10,21 @@
             <key> <string>categories</string> </key>
             <value>
               <tuple>
-                <string>destination/portal_workflow/workflow_ung_configuration_workflow/transition_install</string>
+                <string>destination/portal_workflow/ung_configuration_workflow/11</string>
               </tuple>
             </value>
         </item>
-        <item>
-            <key> <string>default_reference</string> </key>
-            <value> <string>ung_preferences</string> </value>
-        </item>
         <item>
             <key> <string>description</string> </key>
             <value> <string>Define some global preferences for your UNG Site.</string> </value>
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>state_ung_preferences</string> </value>
+            <value> <string>4</string> </value>
         </item>
         <item>
             <key> <string>portal_type</string> </key>
-            <value> <string>State</string> </value>
+            <value> <string>Configuration State</string> </value>
         </item>
         <item>
             <key> <string>title</string> </key>
diff --git a/bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/workflow_ung_configuration_workflow/state_standard_bt5.xml b/bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/ung_configuration_workflow/5.xml
similarity index 64%
rename from bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/workflow_ung_configuration_workflow/state_standard_bt5.xml
rename to bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/ung_configuration_workflow/5.xml
index 89919091775f5ef9352d9bacdb063e476292640a..c7c59fde87a19a8b4cb44463fc73fe4727982ae9 100644
--- a/bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/workflow_ung_configuration_workflow/state_standard_bt5.xml
+++ b/bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/ung_configuration_workflow/5.xml
@@ -2,7 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <global name="State" module="erp5.portal_type"/>
+      <global name="Configuration State" module="erp5.portal_type"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -10,14 +10,10 @@
             <key> <string>categories</string> </key>
             <value>
               <tuple>
-                <string>destination/portal_workflow/workflow_ung_configuration_workflow/transition_setup_customer_bt5</string>
+                <string>destination/portal_workflow/ung_configuration_workflow/12</string>
               </tuple>
             </value>
         </item>
-        <item>
-            <key> <string>default_reference</string> </key>
-            <value> <string>standard_bt5</string> </value>
-        </item>
         <item>
             <key> <string>description</string> </key>
             <value>
@@ -26,11 +22,11 @@
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>state_standard_bt5</string> </value>
+            <value> <string>5</string> </value>
         </item>
         <item>
             <key> <string>portal_type</string> </key>
-            <value> <string>State</string> </value>
+            <value> <string>Configuration State</string> </value>
         </item>
         <item>
             <key> <string>title</string> </key>
diff --git a/bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/ung_configuration_workflow/6.xml b/bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/ung_configuration_workflow/6.xml
new file mode 100644
index 0000000000000000000000000000000000000000..3a3718e82c1a92ade36de0d184030e24b6422d03
--- /dev/null
+++ b/bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/ung_configuration_workflow/6.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Configuration State" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>categories</string> </key>
+            <value>
+              <tuple>
+                <string>destination/portal_workflow/ung_configuration_workflow/10</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string>Enter the number of user accounts you want to create.</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>6</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Configuration State</string> </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>Number of user accounts</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/workflow_ung_configuration_workflow/state_end.xml b/bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/ung_configuration_workflow/7.xml
similarity index 67%
rename from bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/workflow_ung_configuration_workflow/state_end.xml
rename to bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/ung_configuration_workflow/7.xml
index 8ca440c47cafa78a2af25a3738724bf85dc3a6ca..b7be0dbabaa75b1d2a2a35e58547d59208a7f3b9 100644
--- a/bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/workflow_ung_configuration_workflow/state_end.xml
+++ b/bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/ung_configuration_workflow/7.xml
@@ -2,14 +2,10 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <global name="State" module="erp5.portal_type"/>
+      <global name="Configuration State" module="erp5.portal_type"/>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>default_reference</string> </key>
-            <value> <string>end</string> </value>
-        </item>
         <item>
             <key> <string>description</string> </key>
             <value>
@@ -18,11 +14,11 @@
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>state_end</string> </value>
+            <value> <string>7</string> </value>
         </item>
         <item>
             <key> <string>portal_type</string> </key>
-            <value> <string>State</string> </value>
+            <value> <string>Configuration State</string> </value>
         </item>
         <item>
             <key> <string>title</string> </key>
diff --git a/bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/workflow_ung_configuration_workflow/state_your_organisation.xml b/bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/ung_configuration_workflow/8.xml
similarity index 58%
rename from bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/workflow_ung_configuration_workflow/state_your_organisation.xml
rename to bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/ung_configuration_workflow/8.xml
index a11cf7a1c6c87b14e0ebd776e469d14a9f39d893..d3d722d2a3473a0a06b599e5471e66d578c3ed6b 100644
--- a/bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/workflow_ung_configuration_workflow/state_your_organisation.xml
+++ b/bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/ung_configuration_workflow/8.xml
@@ -2,7 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <global name="State" module="erp5.portal_type"/>
+      <global name="Configuration State" module="erp5.portal_type"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -10,29 +10,25 @@
             <key> <string>categories</string> </key>
             <value>
               <tuple>
-                <string>destination/portal_workflow/workflow_ung_configuration_workflow/transition_configure_user_accounts_number</string>
+                <string>destination/portal_workflow/ung_configuration_workflow/17</string>
               </tuple>
             </value>
         </item>
-        <item>
-            <key> <string>default_reference</string> </key>
-            <value> <string>your_organisation</string> </value>
-        </item>
         <item>
             <key> <string>description</string> </key>
             <value> <string>Configure your organisation.</string> </value>
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>state_your_organisation</string> </value>
+            <value> <string>8</string> </value>
         </item>
         <item>
             <key> <string>portal_type</string> </key>
-            <value> <string>State</string> </value>
+            <value> <string>Configuration State</string> </value>
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string>Your Organisation</string> </value>
+            <value> <string>Your organisation</string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/ung_configuration_workflow/9.xml b/bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/ung_configuration_workflow/9.xml
new file mode 100644
index 0000000000000000000000000000000000000000..cef6cf084df20c9d5e7e7308964756959bd22357
--- /dev/null
+++ b/bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/ung_configuration_workflow/9.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Configuration State" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>categories</string> </key>
+            <value>
+              <tuple>
+                <string>destination/portal_workflow/ung_configuration_workflow/14</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string>Enter the data of each user</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>9</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Configuration State</string> </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>User accounts configuration</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/workflow_ung_configuration_workflow/variable_actor.xml b/bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/ung_configuration_workflow/variable_actor.xml
similarity index 100%
rename from bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/workflow_ung_configuration_workflow/variable_actor.xml
rename to bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/ung_configuration_workflow/variable_actor.xml
diff --git a/bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/workflow_ung_configuration_workflow/variable_client_id.xml b/bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/ung_configuration_workflow/variable_client_id.xml
similarity index 100%
rename from bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/workflow_ung_configuration_workflow/variable_client_id.xml
rename to bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/ung_configuration_workflow/variable_client_id.xml
diff --git a/bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/workflow_ung_configuration_workflow/variable_comment.xml b/bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/ung_configuration_workflow/variable_comment.xml
similarity index 100%
rename from bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/workflow_ung_configuration_workflow/variable_comment.xml
rename to bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/ung_configuration_workflow/variable_comment.xml
diff --git a/bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/workflow_ung_configuration_workflow/variable_configuration_save_url.xml b/bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/ung_configuration_workflow/variable_configuration_save_url.xml
similarity index 88%
rename from bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/workflow_ung_configuration_workflow/variable_configuration_save_url.xml
rename to bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/ung_configuration_workflow/variable_configuration_save_url.xml
index 5803427e8eb3385eb96f7bd8428c353974e0a1ac..fdf5808e4f84bb1708e44b7378ef2da888972767 100644
--- a/bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/workflow_ung_configuration_workflow/variable_configuration_save_url.xml
+++ b/bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/ung_configuration_workflow/variable_configuration_save_url.xml
@@ -34,10 +34,6 @@
               <tuple/>
             </value>
         </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>configuration_save_url</string> </value>
-        </item>
       </dictionary>
     </pickle>
   </record>
diff --git a/bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/workflow_ung_configuration_workflow/variable_displayed.xml b/bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/ung_configuration_workflow/variable_displayed.xml
similarity index 100%
rename from bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/workflow_ung_configuration_workflow/variable_displayed.xml
rename to bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/ung_configuration_workflow/variable_displayed.xml
diff --git a/bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/workflow_ung_configuration_workflow/variable_error_message.xml b/bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/ung_configuration_workflow/variable_error_message.xml
similarity index 100%
rename from bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/workflow_ung_configuration_workflow/variable_error_message.xml
rename to bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/ung_configuration_workflow/variable_error_message.xml
diff --git a/bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/workflow_ung_configuration_workflow/variable_time.xml b/bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/ung_configuration_workflow/variable_time.xml
similarity index 100%
rename from bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/workflow_ung_configuration_workflow/variable_time.xml
rename to bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/ung_configuration_workflow/variable_time.xml
diff --git a/bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/workflow_ung_configuration_workflow/variable_transition.xml b/bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/ung_configuration_workflow/variable_transition.xml
similarity index 100%
rename from bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/workflow_ung_configuration_workflow/variable_transition.xml
rename to bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/ung_configuration_workflow/variable_transition.xml
diff --git a/bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/workflow_ung_configuration_workflow/BusinessConfiguration_afterUNGConfiguration.xml b/bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/workflow_ung_configuration_workflow/BusinessConfiguration_afterUNGConfiguration.xml
deleted file mode 100644
index 7a352b335349388a0246c00b6bea614ad770f839..0000000000000000000000000000000000000000
--- a/bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/workflow_ung_configuration_workflow/BusinessConfiguration_afterUNGConfiguration.xml
+++ /dev/null
@@ -1,162 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <global name="Workflow Script" module="erp5.portal_type"/>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>Script_magic</string> </key>
-            <value> <int>3</int> </value>
-        </item>
-        <item>
-            <key> <string>_bind_names</string> </key>
-            <value>
-              <object>
-                <klass>
-                  <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
-                </klass>
-                <tuple/>
-                <state>
-                  <dictionary>
-                    <item>
-                        <key> <string>_asgns</string> </key>
-                        <value>
-                          <dictionary>
-                            <item>
-                                <key> <string>name_container</string> </key>
-                                <value> <string>container</string> </value>
-                            </item>
-                            <item>
-                                <key> <string>name_context</string> </key>
-                                <value> <string>context</string> </value>
-                            </item>
-                            <item>
-                                <key> <string>name_m_self</string> </key>
-                                <value> <string>script</string> </value>
-                            </item>
-                            <item>
-                                <key> <string>name_subpath</string> </key>
-                                <value> <string>traverse_subpath</string> </value>
-                            </item>
-                          </dictionary>
-                        </value>
-                    </item>
-                  </dictionary>
-                </state>
-              </object>
-            </value>
-        </item>
-        <item>
-            <key> <string>_body</string> </key>
-            <value> <string>""" This script will be called to apply the customization. """\n
-from AccessControl import getSecurityManager\n
-\n
-portal = context.getPortalObject()\n
-portal_preferences = portal.portal_preferences\n
-business_template = context.getSpecialiseValue()\n
-isTransitionPossible = portal.portal_workflow.isTransitionPossible\n
-\n
-# enable ung preference\n
-ung_preference = getattr(portal.portal_preferences, \'ung_preference\', None)\n
-if ung_preference is not None and isTransitionPossible(ung_preference, \'enable\'):\n
-  ung_preference.enable()\n
-\n
-# publish the ung web site\n
-ung_web_site = getattr(portal.web_site_module, \'ung\', None)\n
-if ung_web_site is not None and isTransitionPossible(ung_web_site, \'publish\', None):\n
-    ung_web_site.publish()\n
-\n
-language = context.getGlobalConfigurationAttr("default_available_language")\n
-\n
-ung_web_site.setDefaultAvailableLanguage(language)\n
-for web_section in ung_web_site.contentValues(portal_types=\'Web Section\'):\n
-  if isTransitionPossible(web_section, \'publish\', None):\n
-    web_section.publish()\n
-\n
-bt5 = portal.portal_catalog.getResultValue(portal_type="Business Template",\n
-                                           title="erp5_web_ung_role")\n
-\n
-if bt5 is not None:\n
-  for portal_type in bt5.getTemplatePortalTypeRoleList():\n
-    module_list = portal.contentValues(filter=dict(portal_type=portal_type))\n
-    portal_type_object = portal.portal_catalog.getResultValue(portal_type="Base Type",\n
-                                                              id=portal_type)\n
-    portal_type_object.updateRoleMapping()\n
-    context.log("Updated Role Mappings for: %s " % (portal_type_object.getId()))\n
-    for module in module_list:\n
-      module.updateLocalRolesOnSecurityGroups()\n
-      context.log("Updated Role Mappings for: %s(%s) " % (module.getTitle(), module.getPortalType()))\n
-\n
-if business_template is not None:\n
-  # update path items. FIXME: local roles should be exported by business template instead\n
-  for path in business_template.getTemplatePathList():\n
-    obj = portal.restrictedTraverse(path, None)\n
-    # no need to update security on categories\n
-    if obj is not None and obj.getPortalType() not in (\'Category\', \'Base Category\',):\n
-      obj.updateLocalRolesOnSecurityGroups()\n
-      context.log("Updated Role Mappings for: ", path, obj.getPortalType())\n
-\n
-  # validate and open all objects\n
-  for path in business_template.getTemplatePathList():\n
-    obj = context.getPortalObject().restrictedTraverse(path, None)\n
-    if obj is not None and hasattr(obj, \'getPortalType\'):\n
-      # XXX This hardcoded list is a bit inconvinient.\n
-      if obj.getPortalType() in (\'Person\', \n
-                                 \'Organisation\'):\n
-        if isTransitionPossible(obj, \'validate\'):\n
-          obj.validate()\n
-          context.log("Validated: ", obj.getRelativeUrl())\n
-\n
-        for assignment in obj.contentValues(filter={\'portal_type\':\'Assignment\'}):\n
-          if isTransitionPossible(assignment, \'open\'):\n
-            assignment.open()\n
-            assignment.updateLocalRolesOnSecurityGroups()\n
-            context.log("\\tOpen (assignment): ", assignment.getRelativeUrl())\n
-\n
-for gadget in context.portal_gadgets.objectValues():\n
-  if gadget.getValidationState() == \'invisible\':\n
-    gadget.visible()\n
-    gadget.public()\n
-\n
-# XXX - check if is possible add this configuration in bt5\n
-portal.knowledge_pad_module.manage_permission(\'Add portal content\',\n
-                                              roles=[\'Assignor\', "Manager", "Authenticated", "Author"],\n
-                                              acquire=0)\n
-context.log("Indexing translations")\n
-portal.ERP5Site_updateTranslationTable()\n
-\n
-# clear cache so user security is recalculated\n
-portal.portal_caches.clearAllCache()\n
-context.log("Clear cache.")\n
-</string> </value>
-        </item>
-        <item>
-            <key> <string>_params</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>description</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>BusinessConfiguration_afterUNGConfiguration</string> </value>
-        </item>
-        <item>
-            <key> <string>portal_type</string> </key>
-            <value> <string>Workflow Script</string> </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>After UNG Configuration</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/workflow_ung_configuration_workflow/BusinessConfiguration_setupCustomerBT5.xml b/bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/workflow_ung_configuration_workflow/BusinessConfiguration_setupCustomerBT5.xml
deleted file mode 100644
index 3439b4ddc1f89842101f12d7a9ddb4ec273909f7..0000000000000000000000000000000000000000
--- a/bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/workflow_ung_configuration_workflow/BusinessConfiguration_setupCustomerBT5.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <global name="Workflow Script" module="erp5.portal_type"/>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>Script_magic</string> </key>
-            <value> <int>3</int> </value>
-        </item>
-        <item>
-            <key> <string>_bind_names</string> </key>
-            <value>
-              <object>
-                <klass>
-                  <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
-                </klass>
-                <tuple/>
-                <state>
-                  <dictionary>
-                    <item>
-                        <key> <string>_asgns</string> </key>
-                        <value>
-                          <dictionary>
-                            <item>
-                                <key> <string>name_container</string> </key>
-                                <value> <string>container</string> </value>
-                            </item>
-                            <item>
-                                <key> <string>name_context</string> </key>
-                                <value> <string>context</string> </value>
-                            </item>
-                            <item>
-                                <key> <string>name_m_self</string> </key>
-                                <value> <string>script</string> </value>
-                            </item>
-                            <item>
-                                <key> <string>name_subpath</string> </key>
-                                <value> <string>traverse_subpath</string> </value>
-                            </item>
-                          </dictionary>
-                        </value>
-                    </item>
-                  </dictionary>
-                </state>
-              </object>
-            </value>
-        </item>
-        <item>
-            <key> <string>_body</string> </key>
-            <value> <string>configuration_save = context.restrictedTraverse(configuration_save_url)\n
-configuration_save.addConfigurationItem("Customer BT5 Configurator Item", \n
-                                        bt5_title=\'_\'.join(context.getTitle().strip().lower().split()))\n
-</string> </value>
-        </item>
-        <item>
-            <key> <string>_params</string> </key>
-            <value> <string>configuration_save_url=None, **kw</string> </value>
-        </item>
-        <item>
-            <key> <string>description</string> </key>
-            <value> <string>Create a bt5 template that will contain customer configuration.</string> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>BusinessConfiguration_setupCustomerBT5</string> </value>
-        </item>
-        <item>
-            <key> <string>portal_type</string> </key>
-            <value> <string>Workflow Script</string> </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>Setup Customer BT5</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/workflow_ung_configuration_workflow/BusinessConfiguration_setupUNGList.xml b/bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/workflow_ung_configuration_workflow/BusinessConfiguration_setupUNGList.xml
deleted file mode 100644
index 7de2b973d6cf48d291005c7de9b34c0f4c755944..0000000000000000000000000000000000000000
--- a/bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/workflow_ung_configuration_workflow/BusinessConfiguration_setupUNGList.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <global name="Workflow Script" module="erp5.portal_type"/>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>Script_magic</string> </key>
-            <value> <int>3</int> </value>
-        </item>
-        <item>
-            <key> <string>_bind_names</string> </key>
-            <value>
-              <object>
-                <klass>
-                  <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
-                </klass>
-                <tuple/>
-                <state>
-                  <dictionary>
-                    <item>
-                        <key> <string>_asgns</string> </key>
-                        <value>
-                          <dictionary>
-                            <item>
-                                <key> <string>name_container</string> </key>
-                                <value> <string>container</string> </value>
-                            </item>
-                            <item>
-                                <key> <string>name_context</string> </key>
-                                <value> <string>context</string> </value>
-                            </item>
-                            <item>
-                                <key> <string>name_m_self</string> </key>
-                                <value> <string>script</string> </value>
-                            </item>
-                            <item>
-                                <key> <string>name_subpath</string> </key>
-                                <value> <string>traverse_subpath</string> </value>
-                            </item>
-                          </dictionary>
-                        </value>
-                    </item>
-                  </dictionary>
-                </state>
-              </object>
-            </value>
-        </item>
-        <item>
-            <key> <string>_body</string> </key>
-            <value> <string>configuration_save_url = kw.get(\'configuration_save_url\', None)\n
-configuration_save = context.restrictedTraverse(configuration_save_url)\n
-\n
-user_number = context.getGlobalConfigurationAttr(\'user_number\')\n
-\n
-## get only form keys\n
-form_keys = [i for i in kw.keys() if i.startswith(\'field_your_\') and i!=\'field_your_search_text\']\n
-\n
-function = "function/ung_user"\n
-if user_number == 1:\n
-  # only one user\n
-  for key in (\'configuration_save_url\', \'transition\', \'client_id\', \'password_confirm\'):\n
-    kw.pop(key, None)\n
-  configuration_save.addConfigurationItem("Person Configurator Item",\n
-                                          function=function,\n
-                                          **kw)\n
-else:\n
-  # many users\n
-  for counter in range(user_number):\n
-    user_kw = {}\n
-    for key in form_keys:\n
-      new_key = key.replace("field_your_", "")\n
-      value = kw.get(key)\n
-      if value:\n
-        user_kw[new_key] = value[counter]\n
-    # add an user\n
-    user_kw.pop(\'password_confirm\', None)\n
-    configuration_save.addConfigurationItem("Person Configurator Item",\n
-                                            function=function,\n
-                                            **user_kw)\n
-</string> </value>
-        </item>
-        <item>
-            <key> <string>_params</string> </key>
-            <value> <string>**kw</string> </value>
-        </item>
-        <item>
-            <key> <string>description</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>BusinessConfiguration_setupUNGList</string> </value>
-        </item>
-        <item>
-            <key> <string>portal_type</string> </key>
-            <value> <string>Workflow Script</string> </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>Setup web site users</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/workflow_ung_configuration_workflow/BusinessConfiguration_setupUNGOrganisation.xml b/bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/workflow_ung_configuration_workflow/BusinessConfiguration_setupUNGOrganisation.xml
deleted file mode 100644
index e87bef3750e58e504b237b212306c7082d9398d3..0000000000000000000000000000000000000000
--- a/bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/workflow_ung_configuration_workflow/BusinessConfiguration_setupUNGOrganisation.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <global name="Workflow Script" module="erp5.portal_type"/>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>Script_magic</string> </key>
-            <value> <int>3</int> </value>
-        </item>
-        <item>
-            <key> <string>_bind_names</string> </key>
-            <value>
-              <object>
-                <klass>
-                  <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
-                </klass>
-                <tuple/>
-                <state>
-                  <dictionary>
-                    <item>
-                        <key> <string>_asgns</string> </key>
-                        <value>
-                          <dictionary>
-                            <item>
-                                <key> <string>name_container</string> </key>
-                                <value> <string>container</string> </value>
-                            </item>
-                            <item>
-                                <key> <string>name_context</string> </key>
-                                <value> <string>context</string> </value>
-                            </item>
-                            <item>
-                                <key> <string>name_m_self</string> </key>
-                                <value> <string>script</string> </value>
-                            </item>
-                            <item>
-                                <key> <string>name_subpath</string> </key>
-                                <value> <string>traverse_subpath</string> </value>
-                            </item>
-                          </dictionary>
-                        </value>
-                    </item>
-                  </dictionary>
-                </state>
-              </object>
-            </value>
-        </item>
-        <item>
-            <key> <string>_body</string> </key>
-            <value> <string>configuration_save = context.restrictedTraverse(configuration_save_url)\n
-\n
-organisation_configurator_item = configuration_save.addConfigurationItem(\n
-    "Organisation Configurator Item",\n
-    **kw)\n
-\n
-context.setGlobalConfigurationAttr(company_email=kw.get(\'default_email_text\'))\n
-\n
-# store globally company\'s configurator item which we can use later to reconfigure\n
-context.setGlobalConfigurationAttr(\n
-     organisation_configurator_item=\n
-          organisation_configurator_item.getRelativeUrl())\n
-</string> </value>
-        </item>
-        <item>
-            <key> <string>_params</string> </key>
-            <value> <string>configuration_save_url=None, **kw</string> </value>
-        </item>
-        <item>
-            <key> <string>description</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>BusinessConfiguration_setupUNGOrganisation</string> </value>
-        </item>
-        <item>
-            <key> <string>portal_type</string> </key>
-            <value> <string>Workflow Script</string> </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>Setup UNG Organisation</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/workflow_ung_configuration_workflow/BusinessConfiguration_setupUNGPreferences.xml b/bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/workflow_ung_configuration_workflow/BusinessConfiguration_setupUNGPreferences.xml
deleted file mode 100644
index d335421de4ba87c8eac25d70b4366dfbd847fbe9..0000000000000000000000000000000000000000
--- a/bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/workflow_ung_configuration_workflow/BusinessConfiguration_setupUNGPreferences.xml
+++ /dev/null
@@ -1,152 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <global name="Workflow Script" module="erp5.portal_type"/>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>Script_magic</string> </key>
-            <value> <int>3</int> </value>
-        </item>
-        <item>
-            <key> <string>_bind_names</string> </key>
-            <value>
-              <object>
-                <klass>
-                  <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
-                </klass>
-                <tuple/>
-                <state>
-                  <dictionary>
-                    <item>
-                        <key> <string>_asgns</string> </key>
-                        <value>
-                          <dictionary>
-                            <item>
-                                <key> <string>name_container</string> </key>
-                                <value> <string>container</string> </value>
-                            </item>
-                            <item>
-                                <key> <string>name_context</string> </key>
-                                <value> <string>context</string> </value>
-                            </item>
-                            <item>
-                                <key> <string>name_m_self</string> </key>
-                                <value> <string>script</string> </value>
-                            </item>
-                            <item>
-                                <key> <string>name_subpath</string> </key>
-                                <value> <string>traverse_subpath</string> </value>
-                            </item>
-                          </dictionary>
-                        </value>
-                    </item>
-                  </dictionary>
-                </state>
-              </object>
-            </value>
-        </item>
-        <item>
-            <key> <string>_body</string> </key>
-            <value> <string encoding="cdata"><![CDATA[
-
-portal = context.getPortalObject()\n
-configuration_save_url = kw.get(\'configuration_save_url\', None)\n
-preferred_event_sender_email = kw.get(\'preferred_event_sender_email\', \'\')\n
-preferred_date_order = kw.get(\'preferred_date_order\', None)\n
-default_available_language = kw.get(\'default_available_language\', \'en\')\n
-\n
-context.setGlobalConfigurationAttr(default_available_language=default_available_language)\n
-\n
-configuration_save = context.restrictedTraverse(configuration_save_url)\n
-business_configuration = configuration_save.getParent()\n
-\n
-# if preferred email is not specified used previously saved company email.\n
-company_email = context.getGlobalConfigurationAttr(\'company_email\')\n
-if preferred_event_sender_email in (\'\', None,):\n
-  preferred_event_sender_email = company_email\n
-\n
-# configure preferences\n
-prefs = dict(\n
-  preferred_category_child_item_list_method_id = \'getCategoryChildTranslatedLogicalPathItemList\',\n
-  preferred_text_format = \'text/html\',\n
-  preferred_text_editor = \'fck_editor\',\n
-  preferred_date_order = preferred_date_order,\n
-  preferred_listbox_view_mode_line_count = 20,\n
-  preferred_listbox_list_mode_line_count = 20,\n
-  preferred_string_field_width = 30,\n
-  preferred_textarea_width = 80,\n
-  preferred_textarea_height = 5,\n
-  preferred_report_style = \'ODT\',\n
-  preferred_report_format = \'pdf\',\n
-  preferred_money_quantity_field_width = 10,\n
-  preferred_html_style_access_tab = 1,\n
-  preferred_quantity_field_width = 8)\n
-\n
-configuration_save.addConfigurationItem(\n
-    \'Preference Configurator Item\',\n
-    object_id = \'default_configurator_preference\',\n
-    description = "The default parameters for the site are set on this "\n
-    "preference",\n
-    title = "Default Configurator Site Preference",\n
-    **prefs)\n
-\n
-# configure system preferences\n
-# some preparation\n
-system_prefs = dict(\n
-  preferred_event_sender_email = preferred_event_sender_email,\n
-  preferred_event_assessment_form_id_list = [],\n
-  preferred_document_file_name_regular_expression = \\\n
-      \'(?P<node_reference>[a-zA-Z0-9_-]+)-(?P<local_reference>[a-zA-Z0-9_.]+)\'\n
-      \'-(?P<version>[0-9a-zA-Z.]+)-(?P<language>[a-z]{2})[^-]*?\',\n
-  preferred_document_reference_regular_expression = \'(?P<reference>[a-zA-Z0-9\'\n
-      \'-_.]+-[a-zA-Z0-9-_.]+)(|-(?P<version>[0-9a-zA-Z.]+))(|-(?P<language>[a\'\n
-      \'-z]{2})[^-]*)?\',\n
-  preferred_synchronous_metadata_discovery = True,\n
-  preferred_redirect_to_document = True)\n
-\n
-configuration_save.addConfigurationItem(\'System Preference Configurator Item\',\n
-    object_id = \'default_configurator_system_preference\',\n
-    description="The default system parameters for the site are set on this \'\\\n
-    \'preference",\n
-    title="Default Configurator System Site Preference",\n
-    **system_prefs)\n
-\n
-if default_available_language and default_available_language != "en":\n
-  language_dict = context.BusinessConfiguration_getUNGAvailableL10NBusinessTemplateList()\n
-  bt5 = language_dict.get(default_available_language)\n
-  if bt5:\n
-    configuration_save.addConfigurationItem("Standard BT5 Configurator Item",\n
-                                             bt5_id=bt5.get("bt5"))\n
-
-
-]]></string> </value>
-        </item>
-        <item>
-            <key> <string>_params</string> </key>
-            <value> <string>**kw</string> </value>
-        </item>
-        <item>
-            <key> <string>description</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>BusinessConfiguration_setupUNGPreferences</string> </value>
-        </item>
-        <item>
-            <key> <string>portal_type</string> </key>
-            <value> <string>Workflow Script</string> </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>Configure global ERP5 preferences</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/workflow_ung_configuration_workflow/BusinessConfiguration_setupUNGStandardBT5.xml b/bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/workflow_ung_configuration_workflow/BusinessConfiguration_setupUNGStandardBT5.xml
deleted file mode 100644
index 185e9b5595296fe7a9c5441f719b13e89707f6af..0000000000000000000000000000000000000000
--- a/bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/workflow_ung_configuration_workflow/BusinessConfiguration_setupUNGStandardBT5.xml
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <global name="Workflow Script" module="erp5.portal_type"/>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>Script_magic</string> </key>
-            <value> <int>3</int> </value>
-        </item>
-        <item>
-            <key> <string>_bind_names</string> </key>
-            <value>
-              <object>
-                <klass>
-                  <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
-                </klass>
-                <tuple/>
-                <state>
-                  <dictionary>
-                    <item>
-                        <key> <string>_asgns</string> </key>
-                        <value>
-                          <dictionary>
-                            <item>
-                                <key> <string>name_container</string> </key>
-                                <value> <string>container</string> </value>
-                            </item>
-                            <item>
-                                <key> <string>name_context</string> </key>
-                                <value> <string>context</string> </value>
-                            </item>
-                            <item>
-                                <key> <string>name_m_self</string> </key>
-                                <value> <string>script</string> </value>
-                            </item>
-                            <item>
-                                <key> <string>name_subpath</string> </key>
-                                <value> <string>traverse_subpath</string> </value>
-                            </item>
-                          </dictionary>
-                        </value>
-                    </item>
-                  </dictionary>
-                </state>
-              </object>
-            </value>
-        </item>
-        <item>
-            <key> <string>_body</string> </key>
-            <value> <string>configuration_save = context.restrictedTraverse(configuration_save_url)\n
-\n
-bt5_installation_list = (\'erp5_ingestion_mysql_innodb_catalog\',\n
-                         \'erp5_simulation\',\n
-                         \'erp5_dhtml_style\',\n
-                         \'erp5_jquery\',\n
-                         \'erp5_jquery_ui\',\n
-                         \'erp5_web\',\n
-                         \'erp5_ingestion\',\n
-                         \'erp5_dms\',\n
-                         \'erp5_crm\',\n
-                         \'erp5_knowledge_pad\',\n
-                         \'erp5_jquery_plugin_spinbtn\',\n
-                         \'erp5_jquery_plugin_jgraduate\',\n
-                         \'erp5_jquery_plugin_svgicon\',\n
-                         \'erp5_jquery_plugin_hotkey\',\n
-                         \'erp5_jquery_plugin_jquerybbq\',\n
-                         \'erp5_jquery_plugin_svg_editor\',\n
-                         \'erp5_jquery_plugin_sheet\',\n
-                         \'erp5_jquery_plugin_mbmenu\',\n
-                         \'erp5_jquery_plugin_jqchart\',\n
-                         \'erp5_jquery_plugin_colorpicker\',\n
-                         \'erp5_jquery_plugin_elastic\',\n
-                         \'erp5_jquery_plugin_wdcalendar\',\n
-                         \'erp5_jquery_sheet_editor\',\n
-                         \'erp5_xinha_editor\',\n
-                         \'erp5_svg_editor\',\n
-                         \'erp5_email_reader\',\n
-                         \'erp5_web_ung_core\',\n
-                         \'erp5_web_ung_theme\',\n
-                         \'erp5_web_ung_role\')\n
-\n
-bt5_update_catalog = (\'erp5_ingestion_mysql_innodb_catalog\', \'erp5_email_reader\')\n
-\n
-for name in bt5_installation_list:\n
-  configuration_save.addConfigurationItem("Standard BT5 Configurator Item",\n
-                                          title=name, bt5_id=name,\n
-                                          update_catalog=(name in bt5_update_catalog)\n
-                                          )\n
-</string> </value>
-        </item>
-        <item>
-            <key> <string>_params</string> </key>
-            <value> <string>configuration_save_url=None, **kw</string> </value>
-        </item>
-        <item>
-            <key> <string>description</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>BusinessConfiguration_setupUNGStandardBT5</string> </value>
-        </item>
-        <item>
-            <key> <string>portal_type</string> </key>
-            <value> <string>Workflow Script</string> </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>Setup standard ERP5 business templates</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/workflow_ung_configuration_workflow/BusinessConfiguration_setupUNGUserNumber.xml b/bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/workflow_ung_configuration_workflow/BusinessConfiguration_setupUNGUserNumber.xml
deleted file mode 100644
index 11f6064b99acdad83ea3e5b2ba449813e559ecf4..0000000000000000000000000000000000000000
--- a/bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/workflow_ung_configuration_workflow/BusinessConfiguration_setupUNGUserNumber.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <global name="Workflow Script" module="erp5.portal_type"/>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>Script_magic</string> </key>
-            <value> <int>3</int> </value>
-        </item>
-        <item>
-            <key> <string>_bind_names</string> </key>
-            <value>
-              <object>
-                <klass>
-                  <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
-                </klass>
-                <tuple/>
-                <state>
-                  <dictionary>
-                    <item>
-                        <key> <string>_asgns</string> </key>
-                        <value>
-                          <dictionary>
-                            <item>
-                                <key> <string>name_container</string> </key>
-                                <value> <string>container</string> </value>
-                            </item>
-                            <item>
-                                <key> <string>name_context</string> </key>
-                                <value> <string>context</string> </value>
-                            </item>
-                            <item>
-                                <key> <string>name_m_self</string> </key>
-                                <value> <string>script</string> </value>
-                            </item>
-                            <item>
-                                <key> <string>name_subpath</string> </key>
-                                <value> <string>traverse_subpath</string> </value>
-                            </item>
-                          </dictionary>
-                        </value>
-                    </item>
-                  </dictionary>
-                </state>
-              </object>
-            </value>
-        </item>
-        <item>
-            <key> <string>_body</string> </key>
-            <value> <string encoding="cdata"><![CDATA[
-
-configuration_save_url = kw.get(\'configuration_save_url\', None)\n
-user_number = kw.get(\'user_number\', 1)\n
-next_transition = context.getNextTransition().getRelativeUrl()\n
-\n
-if user_number > 1:\n
-  # mark next transition  as multiple\n
-  context.setMultiEntryTransition(next_transition, user_number)\n
-else:\n
-  # explicitly reset next transition as not multiple because \n
-  # we may have already set it as multiple\n
-  context.setMultiEntryTransition(next_transition, 0)\n
-\n
-# store globally\n
-context.setGlobalConfigurationAttr(user_number=user_number)\n
-
-
-]]></string> </value>
-        </item>
-        <item>
-            <key> <string>_params</string> </key>
-            <value> <string>**kw</string> </value>
-        </item>
-        <item>
-            <key> <string>description</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>BusinessConfiguration_setupUNGUserNumber</string> </value>
-        </item>
-        <item>
-            <key> <string>portal_type</string> </key>
-            <value> <string>Workflow Script</string> </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>Setup number of users</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/workflow_ung_configuration_workflow/state_number_of_user_accounts.xml b/bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/workflow_ung_configuration_workflow/state_number_of_user_accounts.xml
deleted file mode 100644
index 391b1a574bd365ae5d4ef5179e3366b2e1c95232..0000000000000000000000000000000000000000
--- a/bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/workflow_ung_configuration_workflow/state_number_of_user_accounts.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <global name="State" module="erp5.portal_type"/>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>categories</string> </key>
-            <value>
-              <tuple>
-                <string>destination/portal_workflow/workflow_ung_configuration_workflow/transition_configure_user_accounts</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>default_reference</string> </key>
-            <value> <string>number_of_user_accounts</string> </value>
-        </item>
-        <item>
-            <key> <string>description</string> </key>
-            <value> <string>Enter the number of user accounts you want to create. In your company, each person using ERP5 should have his own user account.</string> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>state_number_of_user_accounts</string> </value>
-        </item>
-        <item>
-            <key> <string>portal_type</string> </key>
-            <value> <string>State</string> </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>Number of User Accounts</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/workflow_ung_configuration_workflow/state_user_accounts_configuration.xml b/bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/workflow_ung_configuration_workflow/state_user_accounts_configuration.xml
deleted file mode 100644
index 4b5a69b9cf4008acc602cb3ab41838f7b6e05555..0000000000000000000000000000000000000000
--- a/bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/workflow_ung_configuration_workflow/state_user_accounts_configuration.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <global name="State" module="erp5.portal_type"/>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>categories</string> </key>
-            <value>
-              <tuple>
-                <string>destination/portal_workflow/workflow_ung_configuration_workflow/transition_configure_erp5_preferences</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>default_reference</string> </key>
-            <value> <string>user_accounts_configuration</string> </value>
-        </item>
-        <item>
-            <key> <string>description</string> </key>
-            <value> <string>Fill in detailled information for each ERP5 user. At end of configuration process each TioLive user will receive an email containing his username and password.</string> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>state_user_accounts_configuration</string> </value>
-        </item>
-        <item>
-            <key> <string>portal_type</string> </key>
-            <value> <string>State</string> </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>User Accounts Configuration</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/workflow_ung_configuration_workflow/transition_configure_erp5_preferences.xml b/bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/workflow_ung_configuration_workflow/transition_configure_erp5_preferences.xml
deleted file mode 100644
index 459b620194aa60974f5329469db919cefe88c6e3..0000000000000000000000000000000000000000
--- a/bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/workflow_ung_configuration_workflow/transition_configure_erp5_preferences.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <global name="Transition" module="erp5.portal_type"/>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>actbox_icon</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>actbox_name</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>actbox_url</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>after_script_id</string> </key>
-            <value>
-              <tuple>
-                <string>BusinessConfiguration_setupUNGPreferences</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>before_script_id</string> </key>
-            <value>
-              <tuple/>
-            </value>
-        </item>
-        <item>
-            <key> <string>categories</string> </key>
-            <value>
-              <tuple>
-                <string>destination/portal_workflow/workflow_ung_configuration_workflow/state_ung_preferences</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>default_reference</string> </key>
-            <value> <string>configure_erp5_preferences</string> </value>
-        </item>
-        <item>
-            <key> <string>description</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>guard_expression</string> </key>
-            <value> <string>python: True</string> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>transition_configure_erp5_preferences</string> </value>
-        </item>
-        <item>
-            <key> <string>portal_type</string> </key>
-            <value> <string>Transition</string> </value>
-        </item>
-        <item>
-            <key> <string>role</string> </key>
-            <value>
-              <tuple/>
-            </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>Configure ERP5 Preferences</string> </value>
-        </item>
-        <item>
-            <key> <string>trigger_type</string> </key>
-            <value> <int>2</int> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/workflow_ung_configuration_workflow/transition_configure_organisation.xml b/bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/workflow_ung_configuration_workflow/transition_configure_organisation.xml
deleted file mode 100644
index 75980e7de6245e8a6ac6d48024f946ec786f6f95..0000000000000000000000000000000000000000
--- a/bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/workflow_ung_configuration_workflow/transition_configure_organisation.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <global name="Transition" module="erp5.portal_type"/>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>actbox_icon</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>actbox_name</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>actbox_url</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>after_script_id</string> </key>
-            <value>
-              <tuple>
-                <string>BusinessConfiguration_setupUNGOrganisation</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>before_script_id</string> </key>
-            <value>
-              <tuple/>
-            </value>
-        </item>
-        <item>
-            <key> <string>categories</string> </key>
-            <value>
-              <tuple>
-                <string>destination/portal_workflow/workflow_ung_configuration_workflow/state_your_organisation</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>default_reference</string> </key>
-            <value> <string>configure_organisation</string> </value>
-        </item>
-        <item>
-            <key> <string>description</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>guard_expression</string> </key>
-            <value> <string>python: True</string> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>transition_configure_organisation</string> </value>
-        </item>
-        <item>
-            <key> <string>portal_type</string> </key>
-            <value> <string>Transition</string> </value>
-        </item>
-        <item>
-            <key> <string>role</string> </key>
-            <value>
-              <tuple/>
-            </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>Configure Organisation</string> </value>
-        </item>
-        <item>
-            <key> <string>trigger_type</string> </key>
-            <value> <int>2</int> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/workflow_ung_configuration_workflow/transition_configure_user_accounts.xml b/bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/workflow_ung_configuration_workflow/transition_configure_user_accounts.xml
deleted file mode 100644
index 8da73b6cc724e2e57312a2108aa1c6f54214ab8c..0000000000000000000000000000000000000000
--- a/bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/workflow_ung_configuration_workflow/transition_configure_user_accounts.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <global name="Transition" module="erp5.portal_type"/>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>actbox_icon</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>actbox_name</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>actbox_url</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>after_script_id</string> </key>
-            <value>
-              <tuple>
-                <string>BusinessConfiguration_setupUNGList</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>before_script_id</string> </key>
-            <value>
-              <tuple/>
-            </value>
-        </item>
-        <item>
-            <key> <string>categories</string> </key>
-            <value>
-              <tuple>
-                <string>destination/portal_workflow/workflow_ung_configuration_workflow/state_user_accounts_configuration</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>default_reference</string> </key>
-            <value> <string>configure_user_accounts</string> </value>
-        </item>
-        <item>
-            <key> <string>description</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>guard_expression</string> </key>
-            <value> <string>python: True</string> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>transition_configure_user_accounts</string> </value>
-        </item>
-        <item>
-            <key> <string>portal_type</string> </key>
-            <value> <string>Transition</string> </value>
-        </item>
-        <item>
-            <key> <string>role</string> </key>
-            <value>
-              <tuple/>
-            </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>Configure User Accounts</string> </value>
-        </item>
-        <item>
-            <key> <string>trigger_type</string> </key>
-            <value> <int>2</int> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/workflow_ung_configuration_workflow/transition_configure_user_accounts_number.xml b/bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/workflow_ung_configuration_workflow/transition_configure_user_accounts_number.xml
deleted file mode 100644
index 4fd02d8fe3b460f91e21a544b79418cb78015fcc..0000000000000000000000000000000000000000
--- a/bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/workflow_ung_configuration_workflow/transition_configure_user_accounts_number.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <global name="Transition" module="erp5.portal_type"/>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>actbox_icon</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>actbox_name</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>actbox_url</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>after_script_id</string> </key>
-            <value>
-              <tuple>
-                <string>BusinessConfiguration_setupUNGUserNumber</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>before_script_id</string> </key>
-            <value>
-              <tuple/>
-            </value>
-        </item>
-        <item>
-            <key> <string>categories</string> </key>
-            <value>
-              <tuple>
-                <string>destination/portal_workflow/workflow_ung_configuration_workflow/state_number_of_user_accounts</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>default_reference</string> </key>
-            <value> <string>configure_user_accounts_number</string> </value>
-        </item>
-        <item>
-            <key> <string>description</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>guard_expression</string> </key>
-            <value> <string>python: True</string> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>transition_configure_user_accounts_number</string> </value>
-        </item>
-        <item>
-            <key> <string>portal_type</string> </key>
-            <value> <string>Transition</string> </value>
-        </item>
-        <item>
-            <key> <string>role</string> </key>
-            <value>
-              <tuple/>
-            </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>Configure User Accounts Number</string> </value>
-        </item>
-        <item>
-            <key> <string>trigger_type</string> </key>
-            <value> <int>2</int> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/workflow_ung_configuration_workflow/transition_finalize.xml b/bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/workflow_ung_configuration_workflow/transition_finalize.xml
deleted file mode 100644
index 876f44afd868be27589ea7a07a05e619b6cf21af..0000000000000000000000000000000000000000
--- a/bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/workflow_ung_configuration_workflow/transition_finalize.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <global name="Transition" module="erp5.portal_type"/>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>actbox_icon</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>actbox_name</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>actbox_url</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>after_script_id</string> </key>
-            <value>
-              <tuple/>
-            </value>
-        </item>
-        <item>
-            <key> <string>before_script_id</string> </key>
-            <value>
-              <tuple/>
-            </value>
-        </item>
-        <item>
-            <key> <string>categories</string> </key>
-            <value>
-              <tuple>
-                <string>destination/portal_workflow/workflow_ung_configuration_workflow/state_end</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>default_reference</string> </key>
-            <value> <string>finalize</string> </value>
-        </item>
-        <item>
-            <key> <string>description</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>guard_expression</string> </key>
-            <value> <string>python: True</string> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>transition_finalize</string> </value>
-        </item>
-        <item>
-            <key> <string>portal_type</string> </key>
-            <value> <string>Transition</string> </value>
-        </item>
-        <item>
-            <key> <string>role</string> </key>
-            <value>
-              <tuple/>
-            </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>Finalize</string> </value>
-        </item>
-        <item>
-            <key> <string>trigger_type</string> </key>
-            <value> <int>2</int> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/workflow_ung_configuration_workflow/transition_install.xml b/bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/workflow_ung_configuration_workflow/transition_install.xml
deleted file mode 100644
index cfce39953ae1817785490117ea1f5056f71d6316..0000000000000000000000000000000000000000
--- a/bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/workflow_ung_configuration_workflow/transition_install.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <global name="Transition" module="erp5.portal_type"/>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>actbox_icon</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>actbox_name</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>actbox_url</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>after_script_id</string> </key>
-            <value>
-              <tuple/>
-            </value>
-        </item>
-        <item>
-            <key> <string>before_script_id</string> </key>
-            <value>
-              <tuple/>
-            </value>
-        </item>
-        <item>
-            <key> <string>categories</string> </key>
-            <value>
-              <tuple>
-                <string>destination/portal_workflow/workflow_ung_configuration_workflow/state_download</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>default_reference</string> </key>
-            <value> <string>install</string> </value>
-        </item>
-        <item>
-            <key> <string>description</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>guard_expression</string> </key>
-            <value> <string>python: True</string> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>transition_install</string> </value>
-        </item>
-        <item>
-            <key> <string>portal_type</string> </key>
-            <value> <string>Transition</string> </value>
-        </item>
-        <item>
-            <key> <string>role</string> </key>
-            <value>
-              <tuple/>
-            </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>Install</string> </value>
-        </item>
-        <item>
-            <key> <string>trigger_type</string> </key>
-            <value> <int>2</int> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/workflow_ung_configuration_workflow/transition_setup_customer_bt5.xml b/bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/workflow_ung_configuration_workflow/transition_setup_customer_bt5.xml
deleted file mode 100644
index 607417f5e566f02ba59cfeb28c4f76a93779e498..0000000000000000000000000000000000000000
--- a/bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/workflow_ung_configuration_workflow/transition_setup_customer_bt5.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <global name="Transition" module="erp5.portal_type"/>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>actbox_icon</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>actbox_name</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>actbox_url</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>after_script_id</string> </key>
-            <value>
-              <tuple>
-                <string>BusinessConfiguration_setupCustomerBT5</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>before_script_id</string> </key>
-            <value>
-              <tuple/>
-            </value>
-        </item>
-        <item>
-            <key> <string>categories</string> </key>
-            <value>
-              <tuple>
-                <string>destination/portal_workflow/workflow_ung_configuration_workflow/state_customer_bt</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>default_reference</string> </key>
-            <value> <string>setup_customer_bt5</string> </value>
-        </item>
-        <item>
-            <key> <string>description</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>guard_expression</string> </key>
-            <value> <string>python: True</string> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>transition_setup_customer_bt5</string> </value>
-        </item>
-        <item>
-            <key> <string>portal_type</string> </key>
-            <value> <string>Transition</string> </value>
-        </item>
-        <item>
-            <key> <string>role</string> </key>
-            <value>
-              <tuple/>
-            </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>Setup Customer BT5</string> </value>
-        </item>
-        <item>
-            <key> <string>trigger_type</string> </key>
-            <value> <int>2</int> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/workflow_ung_configuration_workflow/transition_setup_standard_bt5.xml b/bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/workflow_ung_configuration_workflow/transition_setup_standard_bt5.xml
deleted file mode 100644
index 87359b48a2a3e2e95a6c8308db01c69bbf71cc79..0000000000000000000000000000000000000000
--- a/bt5/erp5_configurator_ung/WorkflowTemplateItem/portal_workflow/workflow_ung_configuration_workflow/transition_setup_standard_bt5.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <global name="Transition" module="erp5.portal_type"/>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>actbox_icon</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>actbox_name</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>actbox_url</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>after_script_id</string> </key>
-            <value>
-              <tuple>
-                <string>BusinessConfiguration_setupUNGStandardBT5</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>before_script_id</string> </key>
-            <value>
-              <tuple/>
-            </value>
-        </item>
-        <item>
-            <key> <string>categories</string> </key>
-            <value>
-              <tuple>
-                <string>destination/portal_workflow/workflow_ung_configuration_workflow/state_standard_bt5</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>default_reference</string> </key>
-            <value> <string>setup_standard_bt5</string> </value>
-        </item>
-        <item>
-            <key> <string>description</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>guard_expression</string> </key>
-            <value> <string>python: True</string> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>transition_setup_standard_bt5</string> </value>
-        </item>
-        <item>
-            <key> <string>portal_type</string> </key>
-            <value> <string>Transition</string> </value>
-        </item>
-        <item>
-            <key> <string>role</string> </key>
-            <value>
-              <tuple/>
-            </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>Setup Standard BT5</string> </value>
-        </item>
-        <item>
-            <key> <string>trigger_type</string> </key>
-            <value> <int>2</int> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_configurator_ung/bt/template_workflow_id_list b/bt5/erp5_configurator_ung/bt/template_workflow_id_list
index 8824b3ca0cea1b7d0c6efcf68f182387fbf6bfd8..e64572f55c8c3495170d9be84c632d9811a7ce9e 100644
--- a/bt5/erp5_configurator_ung/bt/template_workflow_id_list
+++ b/bt5/erp5_configurator_ung/bt/template_workflow_id_list
@@ -1 +1 @@
-workflow_ung_configuration_workflow
\ No newline at end of file
+ung_configuration_workflow
\ No newline at end of file