From 13dc61e48f815a7b8af95c919fae6be0c9591247 Mon Sep 17 00:00:00 2001
From: Romain Courteaud <romain@nexedi.com>
Date: Fri, 29 Feb 2008 16:39:36 +0000
Subject: [PATCH] Update to last XML format

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@19622 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
 .../portal_types/Bug%20Module/view.xml        |  14 +-
 .../portal_types/Bug/view.xml                 |  14 +-
 .../Business%20Template/commit.xml            |  21 +-
 .../Business%20Template/svn_cleanup_locks.xml |  14 +-
 .../svn_conflicted_files.xml                  |  14 +-
 .../svn_unversioned_files.xml                 |  14 +-
 .../Business%20Template/update_svn_bt.xml     |  14 +-
 .../update_svn_bt_norevert.xml                |  14 +-
 .../view_svn_repos_infos.xml                  |  14 +-
 .../portal_types/External%20Folder/view.xml   |  14 +-
 .../portal_types/Glossary%20Term/view.xml     |  16 +-
 .../portal_types/Preference/subversion.xml    |  14 +-
 .../Template%20Tool/bt_svn_history.xml        |  14 +-
 .../Template%20Tool/search_portal_type.xml    |  14 +-
 .../portal_types/Upload%20Module/view.xml     |  14 +-
 .../portal_categories/bug_difficulty.xml      |  65 +---
 .../portal_categories/bug_group.xml           |  65 +---
 .../portal_categories/bug_priority.xml        |  65 +---
 .../portal_categories/bug_severity.xml        |  65 +---
 .../portal_categories/bug_type.xml            |  65 +---
 .../portal_categories/business_field.xml      | 153 ++++++++--
 .../portal_categories/language.xml            | 153 ++++++++--
 .../ModuleTemplateItem/bug_module.xml         |  22 +-
 .../ModuleTemplateItem/glossary_module.xml    |  16 +-
 .../ModuleTemplateItem/upload_module.xml      |  28 +-
 .../portal_alarms/open_bugs_alarm.xml         | 277 +-----------------
 .../business_field/accounting.xml             |   7 +-
 .../portal_categories/business_field/base.xml |   7 +-
 .../portal_categories/business_field/crm.xml  |   7 +-
 .../business_field/forge.xml                  |   7 +-
 .../portal_categories/business_field/pdm.xml  |   7 +-
 .../portal_categories/business_field/svn.xml  |   7 +-
 .../business_field/trade.xml                  |   7 +-
 .../portal_categories/language/de.xml         |   7 +-
 .../portal_categories/language/en.xml         |   7 +-
 .../portal_categories/language/es.xml         |   7 +-
 .../portal_categories/language/fr.xml         |   7 +-
 .../portal_types/Bug%20Module.xml             |  66 ++++-
 .../portal_types/Bug.xml                      |   7 +-
 .../portal_types/External%20Folder.xml        |   7 +-
 .../portal_types/Glossary%20Module.xml        |   7 +-
 .../portal_types/Glossary%20Term.xml          |   7 +-
 .../portal_types/Upload%20Module.xml          |   7 +-
 .../portal_skins/erp5_forge.xml               |   7 +-
 .../Base_getOriginalBusinessTemplateId.xml    |   7 +-
 .../erp5_forge/Base_getOrphanObjects.xml      |   7 +-
 .../erp5_forge/Base_viewOrphanObjectList.xml  |   7 +-
 .../BugModule_sendOpenBugListReminder.xml     |   8 +-
 .../erp5_forge/BugModule_viewBugList.xml      |   7 +-
 .../erp5_forge/Bug_getFollowUpListAsText.xml  |   8 +-
 .../portal_skins/erp5_forge/Bug_view.xml      |   7 +-
 .../erp5_forge/Bug_view/follow_up.xml         |   7 +-
 .../erp5_forge/Bug_view/my_bug_difficulty.xml |   7 +-
 .../erp5_forge/Bug_view/my_id.xml             |   7 +-
 .../erp5_forge/Bug_view/my_tested.xml         |   7 +-
 .../portal_skins/erp5_forge/Bug_view/note.xml |   7 +-
 .../erp5_forge/ExternalFolder_view.xml        |   7 +-
 .../TemplateTool_searchPortalType.xml         |   7 +-
 ...emplateTool_viewSearchPortalTypeDialog.xml |  17 +-
 .../portal_skins/erp5_forge/diff.xml          |   7 +-
 .../portal_skins/erp5_glossary.xml            |   7 +-
 ...odule_viewFieldAndTermComparisonDialog.xml |  10 +-
 .../GlossaryModule_viewFieldUpdateDialog.xml  |  10 +-
 .../listbox.xml                               |  22 +-
 .../GlossaryModule_viewPOFileExportDialog.xml |  10 +-
 ...ssaryModule_viewTermListCreationDialog.xml |  10 +-
 .../GlossaryTerm_view/my_business_field.xml   |   4 +-
 .../GlossaryTerm_view/my_description.xml      |   2 +-
 .../GlossaryTerm_view/my_language.xml         |   4 +-
 .../GlossaryTerm_view/my_reference.xml        |   2 +-
 .../portal_skins/erp5_svn.xml                 |   7 +-
 .../BusinessTemplate_LogListMethod.xml        |   7 +-
 .../BusinessTemplate_doSvnCleanup.xml         |   7 +-
 .../erp5_svn/BusinessTemplate_doSvnCommit.xml |   7 +-
 .../erp5_svn/BusinessTemplate_doSvnDiff.xml   |   7 +-
 .../erp5_svn/BusinessTemplate_doSvnInfo.xml   |   7 +-
 .../BusinessTemplate_doSvnListConflicted.xml  |   7 +-
 .../BusinessTemplate_doSvnListUnversioned.xml |   7 +-
 .../erp5_svn/BusinessTemplate_doSvnLog.xml    |   7 +-
 .../BusinessTemplate_doSvnLogGlobal.xml       |   7 +-
 .../erp5_svn/BusinessTemplate_doSvnLogin.xml  |   7 +-
 .../erp5_svn/BusinessTemplate_doSvnLs.xml     |   7 +-
 .../BusinessTemplate_doSvnMultiDiff.xml       |   8 +-
 .../BusinessTemplate_doSvnRemoveFiles.xml     |   7 +-
 .../BusinessTemplate_doSvnResolvedFiles.xml   |   7 +-
 .../erp5_svn/BusinessTemplate_doSvnRevert.xml |   7 +-
 .../BusinessTemplate_doSvnSslTrust.xml        |   7 +-
 .../erp5_svn/BusinessTemplate_doSvnUpdate.xml |   7 +-
 .../BusinessTemplate_doSvnUpdateKeep.xml      |   7 +-
 .../BusinessTemplate_viewConflicted.xml       |   7 +-
 .../BusinessTemplate_viewSvnChangelog.xml     |   7 +-
 .../BusinessTemplate_viewSvnInfos.xml         |   7 +-
 .../BusinessTemplate_viewSvnInfosFile.xml     |   7 +-
 .../erp5_svn/BusinessTemplate_viewSvnLog.xml  |   7 +-
 .../BusinessTemplate_viewSvnLogin.xml         |   7 +-
 .../BusinessTemplate_viewSvnMultiDiff.xml     |   7 +-
 .../BusinessTemplate_viewSvnSSLTrust.xml      |   7 +-
 .../BusinessTemplate_viewSvnShowFile.xml      |   7 +-
 .../BusinessTemplate_viewUnversioned.xml      |   7 +-
 .../ERP5Subversion_dhtmlXCommon.js.xml        |   7 +-
 .../ERP5Subversion_dhtmlXTree.css.xml         |   7 +-
 .../erp5_svn/ERP5Subversion_dhtmlXTree.js.xml |   7 +-
 ...P5Subversion_doCreateJavaScriptDiff.js.xml |   7 +-
 ...Subversion_doCreateJavaScriptStatus.js.xml |   7 +-
 .../erp5_svn/ERP5Subversion_imgs.xml          |   7 +-
 .../ERP5Subversion_imgs/altbuttons.gif.xml    |   7 +-
 .../ERP5Subversion_imgs/altbuttonslow.gif.xml |   7 +-
 .../ERP5Subversion_imgs/blank.gif.xml         |   7 +-
 .../ERP5Subversion_imgs/captionoff.png.xml    |   7 +-
 .../ERP5Subversion_imgs/captionon.png.xml     |   7 +-
 .../ERP5Subversion_imgs/diffoff.png.xml       |   7 +-
 .../ERP5Subversion_imgs/diffon.png.xml        |   7 +-
 .../ERP5Subversion_imgs/document.png.xml      |   7 +-
 .../erp5_svn/ERP5Subversion_imgs/edit.png.xml |   7 +-
 .../ERP5Subversion_imgs/execoff.png.xml       |   7 +-
 .../ERP5Subversion_imgs/execon.png.xml        |   7 +-
 .../ERP5Subversion_imgs/expandoff.png.xml     |   7 +-
 .../ERP5Subversion_imgs/expandon.png.xml      |   7 +-
 .../ERP5Subversion_imgs/folder.png.xml        |   7 +-
 .../ERP5Subversion_imgs/folder_open.png.xml   |   7 +-
 .../ERP5Subversion_imgs/iconCheckAll.gif.xml  |   7 +-
 .../ERP5Subversion_imgs/iconCheckGray.gif.xml |   7 +-
 .../iconUnCheckAll.gif.xml                    |   7 +-
 .../ERP5Subversion_imgs/line1.gif.xml         |   7 +-
 .../ERP5Subversion_imgs/line2.gif.xml         |   7 +-
 .../ERP5Subversion_imgs/line3.gif.xml         |   7 +-
 .../ERP5Subversion_imgs/line4.gif.xml         |   7 +-
 .../ERP5Subversion_imgs/minus.gif.xml         |   7 +-
 .../ERP5Subversion_imgs/minus2.gif.xml        |   7 +-
 .../ERP5Subversion_imgs/minus3.gif.xml        |   7 +-
 .../ERP5Subversion_imgs/minus4.gif.xml        |   7 +-
 .../ERP5Subversion_imgs/minus5.gif.xml        |   7 +-
 .../ERP5Subversion_imgs/minus_ar.gif.xml      |   7 +-
 .../erp5_svn/ERP5Subversion_imgs/plus.gif.xml |   7 +-
 .../ERP5Subversion_imgs/plus2.gif.xml         |   7 +-
 .../ERP5Subversion_imgs/plus3.gif.xml         |   7 +-
 .../ERP5Subversion_imgs/plus4.gif.xml         |   7 +-
 .../ERP5Subversion_imgs/plus5.gif.xml         |   7 +-
 .../ERP5Subversion_imgs/plus_ar.gif.xml       |   7 +-
 .../ERP5Subversion_imgs/revertoff.png.xml     |   7 +-
 .../ERP5Subversion_imgs/reverton.png.xml      |   7 +-
 .../ERP5Subversion_imgs/trashoff.png.xml      |   7 +-
 .../ERP5Subversion_imgs/trashon.png.xml       |   7 +-
 .../erp5_svn/ERP5Subversion_imgs/wait.gif.xml |   7 +-
 .../erp5_svn/ERP5Subversion_menuico.js.xml    |   7 +-
 .../ERP5Subversion_movableMenu.css.xml        |   7 +-
 .../ERP5Subversion_movableMenu.js.xml         |   7 +-
 .../erp5_svn/Preference_viewSubversion.xml    |   7 +-
 .../portal_skins/erp5_svn/tree.xml.xml        |   7 +-
 .../portal_skins/erp5_toolbox.xml             |   7 +-
 .../Base_getFunctionFirstArgumentValue.xml    |   7 +-
 .../erp5_toolbox/Base_getSimulationTree.xml   |   7 +-
 .../erp5_toolbox/Base_viewSimulationTree.xml  |   9 +-
 .../ERP5Site_showAllUsedSelectionNames.xml    |   7 +-
 .../SkinsTool_checkDuplicateSelectionName.xml |   2 +-
 .../SkinsTool_listDuplicateSkins.xml          |   2 +-
 .../portal_skins/erp5_toolbox/grep.xml        |   7 +-
 .../portal_workflow/bug_workflow.xml          |   7 +-
 .../portal_workflow/bug_workflow/scripts.xml  |   7 +-
 .../bug_workflow/scripts/confirmTested.xml    |   7 +-
 .../bug_workflow/scripts/sendNotification.xml |   7 +-
 .../bug_workflow/scripts/setCloseDate.xml     |   7 +-
 .../portal_workflow/bug_workflow/states.xml   |   7 +-
 .../bug_workflow/states/cancelled.xml         |   7 +-
 .../bug_workflow/states/closed.xml            |   7 +-
 .../bug_workflow/states/draft.xml             |   7 +-
 .../bug_workflow/states/open.xml              |   7 +-
 .../bug_workflow/transitions.xml              |   7 +-
 .../bug_workflow/transitions/cancel.xml       |   7 +-
 .../transitions/cancel_action.xml             |   7 +-
 .../bug_workflow/transitions/close.xml        |   7 +-
 .../bug_workflow/transitions/close_action.xml |   7 +-
 .../bug_workflow/transitions/follow.xml       |   7 +-
 .../transitions/follow_action.xml             |   7 +-
 .../bug_workflow/transitions/open.xml         |   7 +-
 .../bug_workflow/transitions/open_action.xml  |   7 +-
 .../bug_workflow/transitions/reopen.xml       |   7 +-
 .../transitions/reopen_action.xml             |   7 +-
 .../bug_workflow/variables.xml                |   7 +-
 .../bug_workflow/variables/action.xml         |   7 +-
 .../bug_workflow/variables/actor.xml          |   7 +-
 .../bug_workflow/variables/comment.xml        |   7 +-
 .../bug_workflow/variables/error_message.xml  |   7 +-
 .../bug_workflow/variables/history.xml        |   7 +-
 .../bug_workflow/variables/portal_type.xml    |   7 +-
 .../bug_workflow/variables/time.xml           |   7 +-
 .../bug_workflow/worklists.xml                |   7 +-
 .../bug_workflow/worklists/open_bug.xml       |   7 +-
 bt5/erp5_forge/bt/revision                    |   2 +-
 189 files changed, 787 insertions(+), 1617 deletions(-)

diff --git a/bt5/erp5_forge/ActionTemplateItem/portal_types/Bug%20Module/view.xml b/bt5/erp5_forge/ActionTemplateItem/portal_types/Bug%20Module/view.xml
index d772d32000..10a3172348 100644
--- a/bt5/erp5_forge/ActionTemplateItem/portal_types/Bug%20Module/view.xml
+++ b/bt5/erp5_forge/ActionTemplateItem/portal_types/Bug%20Module/view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/ActionTemplateItem/portal_types/Bug/view.xml b/bt5/erp5_forge/ActionTemplateItem/portal_types/Bug/view.xml
index 12b0735c9a..94ce4f031e 100644
--- a/bt5/erp5_forge/ActionTemplateItem/portal_types/Bug/view.xml
+++ b/bt5/erp5_forge/ActionTemplateItem/portal_types/Bug/view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/ActionTemplateItem/portal_types/Business%20Template/commit.xml b/bt5/erp5_forge/ActionTemplateItem/portal_types/Business%20Template/commit.xml
index 126301a429..b1dfa451bd 100644
--- a/bt5/erp5_forge/ActionTemplateItem/portal_types/Business%20Template/commit.xml
+++ b/bt5/erp5_forge/ActionTemplateItem/portal_types/Business%20Template/commit.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -72,11 +69,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -91,11 +85,8 @@
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/ActionTemplateItem/portal_types/Business%20Template/svn_cleanup_locks.xml b/bt5/erp5_forge/ActionTemplateItem/portal_types/Business%20Template/svn_cleanup_locks.xml
index 55b92928eb..037174aca1 100644
--- a/bt5/erp5_forge/ActionTemplateItem/portal_types/Business%20Template/svn_cleanup_locks.xml
+++ b/bt5/erp5_forge/ActionTemplateItem/portal_types/Business%20Template/svn_cleanup_locks.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/ActionTemplateItem/portal_types/Business%20Template/svn_conflicted_files.xml b/bt5/erp5_forge/ActionTemplateItem/portal_types/Business%20Template/svn_conflicted_files.xml
index f79ed7144d..ec45c45b22 100644
--- a/bt5/erp5_forge/ActionTemplateItem/portal_types/Business%20Template/svn_conflicted_files.xml
+++ b/bt5/erp5_forge/ActionTemplateItem/portal_types/Business%20Template/svn_conflicted_files.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/ActionTemplateItem/portal_types/Business%20Template/svn_unversioned_files.xml b/bt5/erp5_forge/ActionTemplateItem/portal_types/Business%20Template/svn_unversioned_files.xml
index 8db3b07bd3..de76c1e3a9 100644
--- a/bt5/erp5_forge/ActionTemplateItem/portal_types/Business%20Template/svn_unversioned_files.xml
+++ b/bt5/erp5_forge/ActionTemplateItem/portal_types/Business%20Template/svn_unversioned_files.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/ActionTemplateItem/portal_types/Business%20Template/update_svn_bt.xml b/bt5/erp5_forge/ActionTemplateItem/portal_types/Business%20Template/update_svn_bt.xml
index 2aebde01ef..c0399641b1 100644
--- a/bt5/erp5_forge/ActionTemplateItem/portal_types/Business%20Template/update_svn_bt.xml
+++ b/bt5/erp5_forge/ActionTemplateItem/portal_types/Business%20Template/update_svn_bt.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -74,11 +71,8 @@ Revert & Update Business Template from SVN
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/ActionTemplateItem/portal_types/Business%20Template/update_svn_bt_norevert.xml b/bt5/erp5_forge/ActionTemplateItem/portal_types/Business%20Template/update_svn_bt_norevert.xml
index b0bd13bd34..b8a979f81e 100644
--- a/bt5/erp5_forge/ActionTemplateItem/portal_types/Business%20Template/update_svn_bt_norevert.xml
+++ b/bt5/erp5_forge/ActionTemplateItem/portal_types/Business%20Template/update_svn_bt_norevert.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/ActionTemplateItem/portal_types/Business%20Template/view_svn_repos_infos.xml b/bt5/erp5_forge/ActionTemplateItem/portal_types/Business%20Template/view_svn_repos_infos.xml
index 3202603c90..aa7d1bb28b 100644
--- a/bt5/erp5_forge/ActionTemplateItem/portal_types/Business%20Template/view_svn_repos_infos.xml
+++ b/bt5/erp5_forge/ActionTemplateItem/portal_types/Business%20Template/view_svn_repos_infos.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/ActionTemplateItem/portal_types/External%20Folder/view.xml b/bt5/erp5_forge/ActionTemplateItem/portal_types/External%20Folder/view.xml
index 97968fba4d..9ef7a24b54 100644
--- a/bt5/erp5_forge/ActionTemplateItem/portal_types/External%20Folder/view.xml
+++ b/bt5/erp5_forge/ActionTemplateItem/portal_types/External%20Folder/view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/ActionTemplateItem/portal_types/Glossary%20Term/view.xml b/bt5/erp5_forge/ActionTemplateItem/portal_types/Glossary%20Term/view.xml
index fcf5f416ba..c980d6933e 100644
--- a/bt5/erp5_forge/ActionTemplateItem/portal_types/Glossary%20Term/view.xml
+++ b/bt5/erp5_forge/ActionTemplateItem/portal_types/Glossary%20Term/view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -58,7 +55,7 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value>                 <string>View</string> </value>
+            <value> <string>View</string> </value>
         </item>
         <item>
             <key> <string>visible</string> </key>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/ActionTemplateItem/portal_types/Preference/subversion.xml b/bt5/erp5_forge/ActionTemplateItem/portal_types/Preference/subversion.xml
index 38d9610bee..f90456e697 100644
--- a/bt5/erp5_forge/ActionTemplateItem/portal_types/Preference/subversion.xml
+++ b/bt5/erp5_forge/ActionTemplateItem/portal_types/Preference/subversion.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/ActionTemplateItem/portal_types/Template%20Tool/bt_svn_history.xml b/bt5/erp5_forge/ActionTemplateItem/portal_types/Template%20Tool/bt_svn_history.xml
index 16a952e056..d991cefc6c 100644
--- a/bt5/erp5_forge/ActionTemplateItem/portal_types/Template%20Tool/bt_svn_history.xml
+++ b/bt5/erp5_forge/ActionTemplateItem/portal_types/Template%20Tool/bt_svn_history.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/ActionTemplateItem/portal_types/Template%20Tool/search_portal_type.xml b/bt5/erp5_forge/ActionTemplateItem/portal_types/Template%20Tool/search_portal_type.xml
index 9cefd05b2d..dc29d44f4f 100644
--- a/bt5/erp5_forge/ActionTemplateItem/portal_types/Template%20Tool/search_portal_type.xml
+++ b/bt5/erp5_forge/ActionTemplateItem/portal_types/Template%20Tool/search_portal_type.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/ActionTemplateItem/portal_types/Upload%20Module/view.xml b/bt5/erp5_forge/ActionTemplateItem/portal_types/Upload%20Module/view.xml
index 039473e19e..b44ee13092 100644
--- a/bt5/erp5_forge/ActionTemplateItem/portal_types/Upload%20Module/view.xml
+++ b/bt5/erp5_forge/ActionTemplateItem/portal_types/Upload%20Module/view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/CategoryTemplateItem/portal_categories/bug_difficulty.xml b/bt5/erp5_forge/CategoryTemplateItem/portal_categories/bug_difficulty.xml
index 7e5d032640..4ab4249d46 100644
--- a/bt5/erp5_forge/CategoryTemplateItem/portal_categories/bug_difficulty.xml
+++ b/bt5/erp5_forge/CategoryTemplateItem/portal_categories/bug_difficulty.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.Document.BaseCategory</string>
-          <string>BaseCategory</string>
-        </tuple>
-        <none/>
+        <global name="BaseCategory" module="Products.ERP5Type.Document.BaseCategory"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -18,24 +15,6 @@
               <none/>
             </value>
         </item>
-        <item>
-            <key> <string>_count</string> </key>
-            <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
-            </value>
-        </item>
-        <item>
-            <key> <string>_mt_index</string> </key>
-            <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
-            </value>
-        </item>
-        <item>
-            <key> <string>_tree</string> </key>
-            <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
-            </value>
-        </item>
         <item>
             <key> <string>acquisition_append_value</string> </key>
             <value> <int>0</int> </value>
@@ -189,44 +168,4 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="2" aka="AAAAAAAAAAI=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>BTrees.Length</string>
-          <string>Length</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle> <int>0</int> </pickle>
-  </record>
-  <record id="3" aka="AAAAAAAAAAM=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>BTrees.OOBTree</string>
-          <string>OOBTree</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <none/>
-    </pickle>
-  </record>
-  <record id="4" aka="AAAAAAAAAAQ=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>BTrees.OOBTree</string>
-          <string>OOBTree</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <none/>
-    </pickle>
-  </record>
 </ZopeData>
diff --git a/bt5/erp5_forge/CategoryTemplateItem/portal_categories/bug_group.xml b/bt5/erp5_forge/CategoryTemplateItem/portal_categories/bug_group.xml
index 3657ee254c..201cbb36eb 100644
--- a/bt5/erp5_forge/CategoryTemplateItem/portal_categories/bug_group.xml
+++ b/bt5/erp5_forge/CategoryTemplateItem/portal_categories/bug_group.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.Document.BaseCategory</string>
-          <string>BaseCategory</string>
-        </tuple>
-        <none/>
+        <global name="BaseCategory" module="Products.ERP5Type.Document.BaseCategory"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -18,24 +15,6 @@
               <none/>
             </value>
         </item>
-        <item>
-            <key> <string>_count</string> </key>
-            <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
-            </value>
-        </item>
-        <item>
-            <key> <string>_mt_index</string> </key>
-            <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
-            </value>
-        </item>
-        <item>
-            <key> <string>_tree</string> </key>
-            <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
-            </value>
-        </item>
         <item>
             <key> <string>acquisition_append_value</string> </key>
             <value> <int>0</int> </value>
@@ -189,44 +168,4 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="2" aka="AAAAAAAAAAI=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>BTrees.Length</string>
-          <string>Length</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle> <int>0</int> </pickle>
-  </record>
-  <record id="3" aka="AAAAAAAAAAM=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>BTrees.OOBTree</string>
-          <string>OOBTree</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <none/>
-    </pickle>
-  </record>
-  <record id="4" aka="AAAAAAAAAAQ=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>BTrees.OOBTree</string>
-          <string>OOBTree</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <none/>
-    </pickle>
-  </record>
 </ZopeData>
diff --git a/bt5/erp5_forge/CategoryTemplateItem/portal_categories/bug_priority.xml b/bt5/erp5_forge/CategoryTemplateItem/portal_categories/bug_priority.xml
index 7508a29618..304fcbfea4 100644
--- a/bt5/erp5_forge/CategoryTemplateItem/portal_categories/bug_priority.xml
+++ b/bt5/erp5_forge/CategoryTemplateItem/portal_categories/bug_priority.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.Document.BaseCategory</string>
-          <string>BaseCategory</string>
-        </tuple>
-        <none/>
+        <global name="BaseCategory" module="Products.ERP5Type.Document.BaseCategory"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -18,24 +15,6 @@
               <none/>
             </value>
         </item>
-        <item>
-            <key> <string>_count</string> </key>
-            <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
-            </value>
-        </item>
-        <item>
-            <key> <string>_mt_index</string> </key>
-            <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
-            </value>
-        </item>
-        <item>
-            <key> <string>_tree</string> </key>
-            <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
-            </value>
-        </item>
         <item>
             <key> <string>acquisition_append_value</string> </key>
             <value> <int>0</int> </value>
@@ -189,44 +168,4 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="2" aka="AAAAAAAAAAI=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>BTrees.Length</string>
-          <string>Length</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle> <int>0</int> </pickle>
-  </record>
-  <record id="3" aka="AAAAAAAAAAM=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>BTrees.OOBTree</string>
-          <string>OOBTree</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <none/>
-    </pickle>
-  </record>
-  <record id="4" aka="AAAAAAAAAAQ=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>BTrees.OOBTree</string>
-          <string>OOBTree</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <none/>
-    </pickle>
-  </record>
 </ZopeData>
diff --git a/bt5/erp5_forge/CategoryTemplateItem/portal_categories/bug_severity.xml b/bt5/erp5_forge/CategoryTemplateItem/portal_categories/bug_severity.xml
index ab9de1db09..7bdeb2c9db 100644
--- a/bt5/erp5_forge/CategoryTemplateItem/portal_categories/bug_severity.xml
+++ b/bt5/erp5_forge/CategoryTemplateItem/portal_categories/bug_severity.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.Document.BaseCategory</string>
-          <string>BaseCategory</string>
-        </tuple>
-        <none/>
+        <global name="BaseCategory" module="Products.ERP5Type.Document.BaseCategory"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -18,24 +15,6 @@
               <none/>
             </value>
         </item>
-        <item>
-            <key> <string>_count</string> </key>
-            <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
-            </value>
-        </item>
-        <item>
-            <key> <string>_mt_index</string> </key>
-            <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
-            </value>
-        </item>
-        <item>
-            <key> <string>_tree</string> </key>
-            <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
-            </value>
-        </item>
         <item>
             <key> <string>acquisition_append_value</string> </key>
             <value> <int>0</int> </value>
@@ -189,44 +168,4 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="2" aka="AAAAAAAAAAI=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>BTrees.Length</string>
-          <string>Length</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle> <int>0</int> </pickle>
-  </record>
-  <record id="3" aka="AAAAAAAAAAM=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>BTrees.OOBTree</string>
-          <string>OOBTree</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <none/>
-    </pickle>
-  </record>
-  <record id="4" aka="AAAAAAAAAAQ=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>BTrees.OOBTree</string>
-          <string>OOBTree</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <none/>
-    </pickle>
-  </record>
 </ZopeData>
diff --git a/bt5/erp5_forge/CategoryTemplateItem/portal_categories/bug_type.xml b/bt5/erp5_forge/CategoryTemplateItem/portal_categories/bug_type.xml
index 6075e5a320..2c20f34356 100644
--- a/bt5/erp5_forge/CategoryTemplateItem/portal_categories/bug_type.xml
+++ b/bt5/erp5_forge/CategoryTemplateItem/portal_categories/bug_type.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.Document.BaseCategory</string>
-          <string>BaseCategory</string>
-        </tuple>
-        <none/>
+        <global name="BaseCategory" module="Products.ERP5Type.Document.BaseCategory"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -18,24 +15,6 @@
               <none/>
             </value>
         </item>
-        <item>
-            <key> <string>_count</string> </key>
-            <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
-            </value>
-        </item>
-        <item>
-            <key> <string>_mt_index</string> </key>
-            <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
-            </value>
-        </item>
-        <item>
-            <key> <string>_tree</string> </key>
-            <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
-            </value>
-        </item>
         <item>
             <key> <string>acquisition_append_value</string> </key>
             <value> <int>0</int> </value>
@@ -189,44 +168,4 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="2" aka="AAAAAAAAAAI=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>BTrees.Length</string>
-          <string>Length</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle> <int>0</int> </pickle>
-  </record>
-  <record id="3" aka="AAAAAAAAAAM=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>BTrees.OOBTree</string>
-          <string>OOBTree</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <none/>
-    </pickle>
-  </record>
-  <record id="4" aka="AAAAAAAAAAQ=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>BTrees.OOBTree</string>
-          <string>OOBTree</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <none/>
-    </pickle>
-  </record>
 </ZopeData>
diff --git a/bt5/erp5_forge/CategoryTemplateItem/portal_categories/business_field.xml b/bt5/erp5_forge/CategoryTemplateItem/portal_categories/business_field.xml
index 78036fa18e..2f2fb7b94a 100644
--- a/bt5/erp5_forge/CategoryTemplateItem/portal_categories/business_field.xml
+++ b/bt5/erp5_forge/CategoryTemplateItem/portal_categories/business_field.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.Document.BaseCategory</string>
-          <string>BaseCategory</string>
-        </tuple>
-        <none/>
+        <global name="BaseCategory" module="Products.ERP5Type.Document.BaseCategory"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -24,6 +21,10 @@
               <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
             </value>
         </item>
+        <item>
+            <key> <string>_folder_handler</string> </key>
+            <value> <string>CMFBTreeFolderHandler</string> </value>
+        </item>
         <item>
             <key> <string>_mt_index</string> </key>
             <value>
@@ -36,6 +37,38 @@
               <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
             </value>
         </item>
+        <item>
+            <key> <string>acquisition_append_value</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>acquisition_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>acquisition_copy_value</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>acquisition_mask_value</string> </key>
+            <value> <int>1</int> </value>
+        </item>
+        <item>
+            <key> <string>acquisition_object_id</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>acquisition_portal_type</string> </key>
+            <value> <string>python:[]</string> </value>
+        </item>
+        <item>
+            <key> <string>acquisition_sync_value</string> </key>
+            <value> <int>0</int> </value>
+        </item>
         <item>
             <key> <string>categories</string> </key>
             <value>
@@ -44,24 +77,100 @@
               </tuple>
             </value>
         </item>
+        <item>
+            <key> <string>category_type</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>criterion_property</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>description</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>fallback_base_category</string> </key>
             <value>
-              <none/>
+              <tuple/>
             </value>
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value>                 <string>business_field</string> </value>
+            <value> <string>business_field</string> </value>
+        </item>
+        <item>
+            <key> <string>id_generator</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id_group</string> </key>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>last_id</string> </key>
             <value> <string>8</string> </value>
         </item>
+        <item>
+            <key> <string>membership_criterion_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>membership_criterion_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>multimembership_criterion_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>portal_type</string> </key>
             <value> <string>Base Category</string> </value>
         </item>
+        <item>
+            <key> <string>read_permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>rid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>short_title</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>test_method_id</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>title</string> </key>
             <value> <string>Business Field</string> </value>
@@ -72,30 +181,24 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>write_permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
       </dictionary>
     </pickle>
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <tuple>
-          <string>BTrees.Length</string>
-          <string>Length</string>
-        </tuple>
-        <none/>
-      </tuple>
+      <global name="Length" module="BTrees.Length"/>
     </pickle>
     <pickle> <int>0</int> </pickle>
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <tuple>
-        <tuple>
-          <string>BTrees.OOBTree</string>
-          <string>OOBTree</string>
-        </tuple>
-        <none/>
-      </tuple>
+      <global name="OOBTree" module="BTrees._OOBTree"/>
     </pickle>
     <pickle>
       <none/>
@@ -103,13 +206,7 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <tuple>
-        <tuple>
-          <string>BTrees.OOBTree</string>
-          <string>OOBTree</string>
-        </tuple>
-        <none/>
-      </tuple>
+      <global name="OOBTree" module="BTrees._OOBTree"/>
     </pickle>
     <pickle>
       <none/>
diff --git a/bt5/erp5_forge/CategoryTemplateItem/portal_categories/language.xml b/bt5/erp5_forge/CategoryTemplateItem/portal_categories/language.xml
index d4f829e8a0..a52ef54c6e 100644
--- a/bt5/erp5_forge/CategoryTemplateItem/portal_categories/language.xml
+++ b/bt5/erp5_forge/CategoryTemplateItem/portal_categories/language.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.Document.BaseCategory</string>
-          <string>BaseCategory</string>
-        </tuple>
-        <none/>
+        <global name="BaseCategory" module="Products.ERP5Type.Document.BaseCategory"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -24,6 +21,10 @@
               <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
             </value>
         </item>
+        <item>
+            <key> <string>_folder_handler</string> </key>
+            <value> <string>CMFBTreeFolderHandler</string> </value>
+        </item>
         <item>
             <key> <string>_mt_index</string> </key>
             <value>
@@ -36,6 +37,38 @@
               <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
             </value>
         </item>
+        <item>
+            <key> <string>acquisition_append_value</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>acquisition_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>acquisition_copy_value</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>acquisition_mask_value</string> </key>
+            <value> <int>1</int> </value>
+        </item>
+        <item>
+            <key> <string>acquisition_object_id</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>acquisition_portal_type</string> </key>
+            <value> <string>python:[]</string> </value>
+        </item>
+        <item>
+            <key> <string>acquisition_sync_value</string> </key>
+            <value> <int>0</int> </value>
+        </item>
         <item>
             <key> <string>categories</string> </key>
             <value>
@@ -44,24 +77,100 @@
               </tuple>
             </value>
         </item>
+        <item>
+            <key> <string>category_type</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>criterion_property</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>description</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>fallback_base_category</string> </key>
             <value>
-              <none/>
+              <tuple/>
             </value>
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value>                 <string>language</string> </value>
+            <value> <string>language</string> </value>
+        </item>
+        <item>
+            <key> <string>id_generator</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id_group</string> </key>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>last_id</string> </key>
             <value> <string>3</string> </value>
         </item>
+        <item>
+            <key> <string>membership_criterion_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>membership_criterion_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>multimembership_criterion_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>portal_type</string> </key>
             <value> <string>Base Category</string> </value>
         </item>
+        <item>
+            <key> <string>read_permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>rid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>short_title</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>test_method_id</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>title</string> </key>
             <value> <string>Language</string> </value>
@@ -72,30 +181,24 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>write_permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
       </dictionary>
     </pickle>
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <tuple>
-          <string>BTrees.Length</string>
-          <string>Length</string>
-        </tuple>
-        <none/>
-      </tuple>
+      <global name="Length" module="BTrees.Length"/>
     </pickle>
     <pickle> <int>0</int> </pickle>
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <tuple>
-        <tuple>
-          <string>BTrees.OOBTree</string>
-          <string>OOBTree</string>
-        </tuple>
-        <none/>
-      </tuple>
+      <global name="OOBTree" module="BTrees._OOBTree"/>
     </pickle>
     <pickle>
       <none/>
@@ -103,13 +206,7 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <tuple>
-        <tuple>
-          <string>BTrees.OOBTree</string>
-          <string>OOBTree</string>
-        </tuple>
-        <none/>
-      </tuple>
+      <global name="OOBTree" module="BTrees._OOBTree"/>
     </pickle>
     <pickle>
       <none/>
diff --git a/bt5/erp5_forge/ModuleTemplateItem/bug_module.xml b/bt5/erp5_forge/ModuleTemplateItem/bug_module.xml
index 04af7e4a51..6424921c56 100644
--- a/bt5/erp5_forge/ModuleTemplateItem/bug_module.xml
+++ b/bt5/erp5_forge/ModuleTemplateItem/bug_module.xml
@@ -40,6 +40,9 @@
    <role>Author</role>
    <role>Manager</role>
   </permission>
+  <permission type='list'>
+   <name>AccessContentsInformation</name>
+  </permission>
   <permission type='tuple'>
    <name>Add Accelerated HTTP Cache Managers</name>
    <role>Manager</role>
@@ -220,6 +223,9 @@
    <name>Add MessageCatalogs</name>
    <role>Manager</role>
   </permission>
+  <permission type='list'>
+   <name>Add MimetypesRegistry Tools</name>
+  </permission>
   <permission type='tuple'>
    <name>Add Page Templates</name>
    <role>Manager</role>
@@ -231,6 +237,9 @@
   <permission type='list'>
    <name>Add Plugin Registrys</name>
   </permission>
+  <permission type='list'>
+   <name>Add PortalTransforms Tools</name>
+  </permission>
   <permission type='tuple'>
    <name>Add Python Scripts</name>
    <role>Manager</role>
@@ -263,10 +272,6 @@
    <name>Add User Folders</name>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Add Versions</name>
-   <role>Manager</role>
-  </permission>
   <permission type='tuple'>
    <name>Add Virtual Host Monsters</name>
    <role>Manager</role>
@@ -431,6 +436,9 @@
    <name>Change proxy roles</name>
    <role>Manager</role>
   </permission>
+  <permission type='list'>
+   <name>Change user folder</name>
+  </permission>
   <permission type='tuple'>
    <name>Copy or Move</name>
    <role>Manager</role>
@@ -515,6 +523,9 @@
   <permission type='list'>
    <name>Manage Groups</name>
   </permission>
+  <permission type='list'>
+   <name>Manage Selenium test cases</name>
+  </permission>
   <permission type='tuple'>
    <name>Manage Transient Object Container</name>
    <role>Manager</role>
@@ -539,6 +550,9 @@
    <name>Manage ZCatalogIndex Entries</name>
    <role>Manager</role>
   </permission>
+  <permission type='list'>
+   <name>Manage extensions</name>
+  </permission>
   <permission type='tuple'>
    <name>Manage languages</name>
    <role>Manager</role>
diff --git a/bt5/erp5_forge/ModuleTemplateItem/glossary_module.xml b/bt5/erp5_forge/ModuleTemplateItem/glossary_module.xml
index 7d9b33be70..a823a1b6f8 100644
--- a/bt5/erp5_forge/ModuleTemplateItem/glossary_module.xml
+++ b/bt5/erp5_forge/ModuleTemplateItem/glossary_module.xml
@@ -40,9 +40,8 @@
    <role>Author</role>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
+  <permission type='list'>
    <name>AccessContentsInformation</name>
-   <role>Manager</role>
   </permission>
   <permission type='tuple'>
    <name>Add Accelerated HTTP Cache Managers</name>
@@ -232,6 +231,9 @@
    <name>Add MessageCatalogs</name>
    <role>Manager</role>
   </permission>
+  <permission type='list'>
+   <name>Add MimetypesRegistry Tools</name>
+  </permission>
   <permission type='tuple'>
    <name>Add Page Templates</name>
    <role>Manager</role>
@@ -244,6 +246,9 @@
    <name>Add Plugin Registrys</name>
    <role>Manager</role>
   </permission>
+  <permission type='list'>
+   <name>Add PortalTransforms Tools</name>
+  </permission>
   <permission type='tuple'>
    <name>Add Python Scripts</name>
    <role>Manager</role>
@@ -276,10 +281,6 @@
    <name>Add User Folders</name>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Add Versions</name>
-   <role>Manager</role>
-  </permission>
   <permission type='tuple'>
    <name>Add Virtual Host Monsters</name>
    <role>Manager</role>
@@ -449,6 +450,9 @@
    <name>Change proxy roles</name>
    <role>Manager</role>
   </permission>
+  <permission type='list'>
+   <name>Change user folder</name>
+  </permission>
   <permission type='tuple'>
    <name>Copy or Move</name>
    <role>Assignee</role>
diff --git a/bt5/erp5_forge/ModuleTemplateItem/upload_module.xml b/bt5/erp5_forge/ModuleTemplateItem/upload_module.xml
index 4dee4d2b45..57bdced3d7 100644
--- a/bt5/erp5_forge/ModuleTemplateItem/upload_module.xml
+++ b/bt5/erp5_forge/ModuleTemplateItem/upload_module.xml
@@ -40,6 +40,9 @@
    <role>Author</role>
    <role>Manager</role>
   </permission>
+  <permission type='list'>
+   <name>AccessContentsInformation</name>
+  </permission>
   <permission type='tuple'>
    <name>Add Accelerated HTTP Cache Managers</name>
    <role>Manager</role>
@@ -236,14 +239,6 @@
    <name>Add Page Templates</name>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Add Photo Folders</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add Photos</name>
-   <role>Manager</role>
-  </permission>
   <permission type='tuple'>
    <name>Add Pluggable Index</name>
    <role>Manager</role>
@@ -288,10 +283,6 @@
    <name>Add User Folders</name>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Add Versions</name>
-   <role>Manager</role>
-  </permission>
   <permission type='tuple'>
    <name>Add Virtual Host Monsters</name>
    <role>Manager</role>
@@ -404,10 +395,6 @@
    <name>Change Page Templates</name>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Change Photo</name>
-   <role>Manager</role>
-  </permission>
   <permission type='tuple'>
    <name>Change Python Scripts</name>
    <role>Manager</role>
@@ -465,6 +452,9 @@
    <name>Change proxy roles</name>
    <role>Manager</role>
   </permission>
+  <permission type='list'>
+   <name>Change user folder</name>
+  </permission>
   <permission type='tuple'>
    <name>Copy or Move</name>
    <role>Assignee</role>
@@ -556,6 +546,9 @@
    <name>Manage Groups</name>
    <role>Manager</role>
   </permission>
+  <permission type='list'>
+   <name>Manage Selenium test cases</name>
+  </permission>
   <permission type='tuple'>
    <name>Manage Transient Object Container</name>
    <role>Manager</role>
@@ -580,6 +573,9 @@
    <name>Manage ZCatalogIndex Entries</name>
    <role>Manager</role>
   </permission>
+  <permission type='list'>
+   <name>Manage extensions</name>
+  </permission>
   <permission type='tuple'>
    <name>Manage languages</name>
    <role>Manager</role>
diff --git a/bt5/erp5_forge/PathTemplateItem/portal_alarms/open_bugs_alarm.xml b/bt5/erp5_forge/PathTemplateItem/portal_alarms/open_bugs_alarm.xml
index 059358a220..95bf943af1 100644
--- a/bt5/erp5_forge/PathTemplateItem/portal_alarms/open_bugs_alarm.xml
+++ b/bt5/erp5_forge/PathTemplateItem/portal_alarms/open_bugs_alarm.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.Document.Alarm</string>
-          <string>Alarm</string>
-        </tuple>
-        <none/>
+        <global name="Alarm" module="Products.ERP5Type.Document.Alarm"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -39,92 +36,10 @@
                   <none/>
                 </tuple>
                 <state>
-                  <dictionary>
-                    <item>
-                        <key> <string>_aday</string> </key>
-                        <value> <string>Mon</string> </value>
-                    </item>
-                    <item>
-                        <key> <string>_amon</string> </key>
-                        <value> <string>Sep</string> </value>
-                    </item>
-                    <item>
-                        <key> <string>_d</string> </key>
-                        <value> <float>38611.4590278</float> </value>
-                    </item>
-                    <item>
-                        <key> <string>_day</string> </key>
-                        <value> <int>18</int> </value>
-                    </item>
-                    <item>
-                        <key> <string>_dayoffset</string> </key>
-                        <value> <int>1</int> </value>
-                    </item>
-                    <item>
-                        <key> <string>_fday</string> </key>
-                        <value> <string>Monday</string> </value>
-                    </item>
-                    <item>
-                        <key> <string>_fmon</string> </key>
-                        <value> <string>September</string> </value>
-                    </item>
-                    <item>
-                        <key> <string>_hour</string> </key>
-                        <value> <int>13</int> </value>
-                    </item>
-                    <item>
-                        <key> <string>_millis</string> </key>
-                        <value> <long>1158577260000</long> </value>
-                    </item>
-                    <item>
-                        <key> <string>_minute</string> </key>
-                        <value> <int>1</int> </value>
-                    </item>
-                    <item>
-                        <key> <string>_month</string> </key>
-                        <value> <int>9</int> </value>
-                    </item>
-                    <item>
-                        <key> <string>_nearsec</string> </key>
-                        <value> <float>0.0</float> </value>
-                    </item>
-                    <item>
-                        <key> <string>_pday</string> </key>
-                        <value> <string>Mon.</string> </value>
-                    </item>
-                    <item>
-                        <key> <string>_pm</string> </key>
-                        <value> <string>pm</string> </value>
-                    </item>
-                    <item>
-                        <key> <string>_pmhour</string> </key>
-                        <value> <int>1</int> </value>
-                    </item>
-                    <item>
-                        <key> <string>_pmon</string> </key>
-                        <value> <string>Sep.</string> </value>
-                    </item>
-                    <item>
-                        <key> <string>_second</string> </key>
-                        <value> <float>0.0</float> </value>
-                    </item>
-                    <item>
-                        <key> <string>_t</string> </key>
-                        <value> <float>1158577260.0</float> </value>
-                    </item>
-                    <item>
-                        <key> <string>_tz</string> </key>
-                        <value> <string>GMT+2</string> </value>
-                    </item>
-                    <item>
-                        <key> <string>_year</string> </key>
-                        <value> <int>2006</int> </value>
-                    </item>
-                    <item>
-                        <key> <string>time</string> </key>
-                        <value> <float>0.459027777775</float> </value>
-                    </item>
-                  </dictionary>
+                  <tuple>
+                    <float>1158577260.0</float>
+                    <string>GMT+2</string>
+                  </tuple>
                 </state>
               </object>
             </value>
@@ -202,92 +117,10 @@
                   <none/>
                 </tuple>
                 <state>
-                  <dictionary>
-                    <item>
-                        <key> <string>_aday</string> </key>
-                        <value> <string>Fri</string> </value>
-                    </item>
-                    <item>
-                        <key> <string>_amon</string> </key>
-                        <value> <string>Sep</string> </value>
-                    </item>
-                    <item>
-                        <key> <string>_d</string> </key>
-                        <value> <float>38593.9166667</float> </value>
-                    </item>
-                    <item>
-                        <key> <string>_day</string> </key>
-                        <value> <int>1</int> </value>
-                    </item>
-                    <item>
-                        <key> <string>_dayoffset</string> </key>
-                        <value> <int>5</int> </value>
-                    </item>
-                    <item>
-                        <key> <string>_fday</string> </key>
-                        <value> <string>Friday</string> </value>
-                    </item>
-                    <item>
-                        <key> <string>_fmon</string> </key>
-                        <value> <string>September</string> </value>
-                    </item>
-                    <item>
-                        <key> <string>_hour</string> </key>
-                        <value> <int>0</int> </value>
-                    </item>
-                    <item>
-                        <key> <string>_millis</string> </key>
-                        <value> <long>1157061600000</long> </value>
-                    </item>
-                    <item>
-                        <key> <string>_minute</string> </key>
-                        <value> <int>0</int> </value>
-                    </item>
-                    <item>
-                        <key> <string>_month</string> </key>
-                        <value> <int>9</int> </value>
-                    </item>
-                    <item>
-                        <key> <string>_nearsec</string> </key>
-                        <value> <float>0.0</float> </value>
-                    </item>
-                    <item>
-                        <key> <string>_pday</string> </key>
-                        <value> <string>Fri.</string> </value>
-                    </item>
-                    <item>
-                        <key> <string>_pm</string> </key>
-                        <value> <string>am</string> </value>
-                    </item>
-                    <item>
-                        <key> <string>_pmhour</string> </key>
-                        <value> <int>12</int> </value>
-                    </item>
-                    <item>
-                        <key> <string>_pmon</string> </key>
-                        <value> <string>Sep.</string> </value>
-                    </item>
-                    <item>
-                        <key> <string>_second</string> </key>
-                        <value> <float>0.0</float> </value>
-                    </item>
-                    <item>
-                        <key> <string>_t</string> </key>
-                        <value> <float>1157061600.0</float> </value>
-                    </item>
-                    <item>
-                        <key> <string>_tz</string> </key>
-                        <value> <string>GMT+2</string> </value>
-                    </item>
-                    <item>
-                        <key> <string>_year</string> </key>
-                        <value> <int>2006</int> </value>
-                    </item>
-                    <item>
-                        <key> <string>time</string> </key>
-                        <value> <float>0.916666666664</float> </value>
-                    </item>
-                  </dictionary>
+                  <tuple>
+                    <float>1157061600.0</float>
+                    <string>GMT+2</string>
+                  </tuple>
                 </state>
               </object>
             </value>
@@ -301,92 +134,10 @@
                   <none/>
                 </tuple>
                 <state>
-                  <dictionary>
-                    <item>
-                        <key> <string>_aday</string> </key>
-                        <value> <string>Wed</string> </value>
-                    </item>
-                    <item>
-                        <key> <string>_amon</string> </key>
-                        <value> <string>Jan</string> </value>
-                    </item>
-                    <item>
-                        <key> <string>_d</string> </key>
-                        <value> <float>401401.958333</float> </value>
-                    </item>
-                    <item>
-                        <key> <string>_day</string> </key>
-                        <value> <int>1</int> </value>
-                    </item>
-                    <item>
-                        <key> <string>_dayoffset</string> </key>
-                        <value> <int>3</int> </value>
-                    </item>
-                    <item>
-                        <key> <string>_fday</string> </key>
-                        <value> <string>Wednesday</string> </value>
-                    </item>
-                    <item>
-                        <key> <string>_fmon</string> </key>
-                        <value> <string>January</string> </value>
-                    </item>
-                    <item>
-                        <key> <string>_hour</string> </key>
-                        <value> <int>0</int> </value>
-                    </item>
-                    <item>
-                        <key> <string>_millis</string> </key>
-                        <value> <long>32503676400000</long> </value>
-                    </item>
-                    <item>
-                        <key> <string>_minute</string> </key>
-                        <value> <int>0</int> </value>
-                    </item>
-                    <item>
-                        <key> <string>_month</string> </key>
-                        <value> <int>1</int> </value>
-                    </item>
-                    <item>
-                        <key> <string>_nearsec</string> </key>
-                        <value> <float>0.0</float> </value>
-                    </item>
-                    <item>
-                        <key> <string>_pday</string> </key>
-                        <value> <string>Wed.</string> </value>
-                    </item>
-                    <item>
-                        <key> <string>_pm</string> </key>
-                        <value> <string>am</string> </value>
-                    </item>
-                    <item>
-                        <key> <string>_pmhour</string> </key>
-                        <value> <int>12</int> </value>
-                    </item>
-                    <item>
-                        <key> <string>_pmon</string> </key>
-                        <value> <string>Jan.</string> </value>
-                    </item>
-                    <item>
-                        <key> <string>_second</string> </key>
-                        <value> <float>0.0</float> </value>
-                    </item>
-                    <item>
-                        <key> <string>_t</string> </key>
-                        <value> <float>32503676400.0</float> </value>
-                    </item>
-                    <item>
-                        <key> <string>_tz</string> </key>
-                        <value> <string>GMT+1</string> </value>
-                    </item>
-                    <item>
-                        <key> <string>_year</string> </key>
-                        <value> <int>3000</int> </value>
-                    </item>
-                    <item>
-                        <key> <string>time</string> </key>
-                        <value> <float>0.958333333314</float> </value>
-                    </item>
-                  </dictionary>
+                  <tuple>
+                    <float>32503676400.0</float>
+                    <string>GMT+1</string>
+                  </tuple>
                 </state>
               </object>
             </value>
diff --git a/bt5/erp5_forge/PathTemplateItem/portal_categories/business_field/accounting.xml b/bt5/erp5_forge/PathTemplateItem/portal_categories/business_field/accounting.xml
index dcb77efa93..a9f066106b 100644
--- a/bt5/erp5_forge/PathTemplateItem/portal_categories/business_field/accounting.xml
+++ b/bt5/erp5_forge/PathTemplateItem/portal_categories/business_field/accounting.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.Document.Category</string>
-          <string>Category</string>
-        </tuple>
-        <none/>
+        <global name="Category" module="Products.ERP5Type.Document.Category"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/PathTemplateItem/portal_categories/business_field/base.xml b/bt5/erp5_forge/PathTemplateItem/portal_categories/business_field/base.xml
index c05697b050..eeff7ebbb9 100644
--- a/bt5/erp5_forge/PathTemplateItem/portal_categories/business_field/base.xml
+++ b/bt5/erp5_forge/PathTemplateItem/portal_categories/business_field/base.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.Document.Category</string>
-          <string>Category</string>
-        </tuple>
-        <none/>
+        <global name="Category" module="Products.ERP5Type.Document.Category"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/PathTemplateItem/portal_categories/business_field/crm.xml b/bt5/erp5_forge/PathTemplateItem/portal_categories/business_field/crm.xml
index d4b5b8f567..2a90303e34 100644
--- a/bt5/erp5_forge/PathTemplateItem/portal_categories/business_field/crm.xml
+++ b/bt5/erp5_forge/PathTemplateItem/portal_categories/business_field/crm.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.Document.Category</string>
-          <string>Category</string>
-        </tuple>
-        <none/>
+        <global name="Category" module="Products.ERP5Type.Document.Category"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/PathTemplateItem/portal_categories/business_field/forge.xml b/bt5/erp5_forge/PathTemplateItem/portal_categories/business_field/forge.xml
index 82913fd0be..567eed76c3 100644
--- a/bt5/erp5_forge/PathTemplateItem/portal_categories/business_field/forge.xml
+++ b/bt5/erp5_forge/PathTemplateItem/portal_categories/business_field/forge.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.Document.Category</string>
-          <string>Category</string>
-        </tuple>
-        <none/>
+        <global name="Category" module="Products.ERP5Type.Document.Category"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/PathTemplateItem/portal_categories/business_field/pdm.xml b/bt5/erp5_forge/PathTemplateItem/portal_categories/business_field/pdm.xml
index ebbbddb8f9..113b3095d9 100644
--- a/bt5/erp5_forge/PathTemplateItem/portal_categories/business_field/pdm.xml
+++ b/bt5/erp5_forge/PathTemplateItem/portal_categories/business_field/pdm.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.Document.Category</string>
-          <string>Category</string>
-        </tuple>
-        <none/>
+        <global name="Category" module="Products.ERP5Type.Document.Category"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/PathTemplateItem/portal_categories/business_field/svn.xml b/bt5/erp5_forge/PathTemplateItem/portal_categories/business_field/svn.xml
index 8dde260d8e..716fe381ce 100644
--- a/bt5/erp5_forge/PathTemplateItem/portal_categories/business_field/svn.xml
+++ b/bt5/erp5_forge/PathTemplateItem/portal_categories/business_field/svn.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.Document.Category</string>
-          <string>Category</string>
-        </tuple>
-        <none/>
+        <global name="Category" module="Products.ERP5Type.Document.Category"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/PathTemplateItem/portal_categories/business_field/trade.xml b/bt5/erp5_forge/PathTemplateItem/portal_categories/business_field/trade.xml
index 8ed7484130..f856c471ad 100644
--- a/bt5/erp5_forge/PathTemplateItem/portal_categories/business_field/trade.xml
+++ b/bt5/erp5_forge/PathTemplateItem/portal_categories/business_field/trade.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.Document.Category</string>
-          <string>Category</string>
-        </tuple>
-        <none/>
+        <global name="Category" module="Products.ERP5Type.Document.Category"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/PathTemplateItem/portal_categories/language/de.xml b/bt5/erp5_forge/PathTemplateItem/portal_categories/language/de.xml
index 510e86543e..84531ba09b 100644
--- a/bt5/erp5_forge/PathTemplateItem/portal_categories/language/de.xml
+++ b/bt5/erp5_forge/PathTemplateItem/portal_categories/language/de.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.Document.Category</string>
-          <string>Category</string>
-        </tuple>
-        <none/>
+        <global name="Category" module="Products.ERP5Type.Document.Category"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/PathTemplateItem/portal_categories/language/en.xml b/bt5/erp5_forge/PathTemplateItem/portal_categories/language/en.xml
index 0cb3b847ca..2300683ce2 100644
--- a/bt5/erp5_forge/PathTemplateItem/portal_categories/language/en.xml
+++ b/bt5/erp5_forge/PathTemplateItem/portal_categories/language/en.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.Document.Category</string>
-          <string>Category</string>
-        </tuple>
-        <none/>
+        <global name="Category" module="Products.ERP5Type.Document.Category"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/PathTemplateItem/portal_categories/language/es.xml b/bt5/erp5_forge/PathTemplateItem/portal_categories/language/es.xml
index c5f275230e..c30b837f3e 100644
--- a/bt5/erp5_forge/PathTemplateItem/portal_categories/language/es.xml
+++ b/bt5/erp5_forge/PathTemplateItem/portal_categories/language/es.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.Document.Category</string>
-          <string>Category</string>
-        </tuple>
-        <none/>
+        <global name="Category" module="Products.ERP5Type.Document.Category"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/PathTemplateItem/portal_categories/language/fr.xml b/bt5/erp5_forge/PathTemplateItem/portal_categories/language/fr.xml
index aa9b70f811..b6b6918828 100644
--- a/bt5/erp5_forge/PathTemplateItem/portal_categories/language/fr.xml
+++ b/bt5/erp5_forge/PathTemplateItem/portal_categories/language/fr.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.Document.Category</string>
-          <string>Category</string>
-        </tuple>
-        <none/>
+        <global name="Category" module="Products.ERP5Type.Document.Category"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/PortalTypeTemplateItem/portal_types/Bug%20Module.xml b/bt5/erp5_forge/PortalTypeTemplateItem/portal_types/Bug%20Module.xml
index 56b1e0affd..c0c12d1378 100644
--- a/bt5/erp5_forge/PortalTypeTemplateItem/portal_types/Bug%20Module.xml
+++ b/bt5/erp5_forge/PortalTypeTemplateItem/portal_types/Bug%20Module.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.ERP5Type</string>
-          <string>ERP5TypeInformation</string>
-        </tuple>
-        <none/>
+        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -36,6 +33,25 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>_property_domain_dict</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>short_title</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+                    </value>
+                </item>
+                <item>
+                    <key> <string>title</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
         <item>
             <key> <string>_roles</string> </key>
             <value>
@@ -118,4 +134,44 @@ be a problem).</string> </value>
       </dictionary>
     </pickle>
   </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <tuple>
+        <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>domain_name</string> </key>
+            <value> <string>erp5_content</string> </value>
+        </item>
+        <item>
+            <key> <string>property_name</string> </key>
+            <value> <string>short_title</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <tuple>
+        <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>domain_name</string> </key>
+            <value> <string>erp5_content</string> </value>
+        </item>
+        <item>
+            <key> <string>property_name</string> </key>
+            <value> <string>title</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
 </ZopeData>
diff --git a/bt5/erp5_forge/PortalTypeTemplateItem/portal_types/Bug.xml b/bt5/erp5_forge/PortalTypeTemplateItem/portal_types/Bug.xml
index 0ef3a3cad3..edb86eceed 100644
--- a/bt5/erp5_forge/PortalTypeTemplateItem/portal_types/Bug.xml
+++ b/bt5/erp5_forge/PortalTypeTemplateItem/portal_types/Bug.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.ERP5Type</string>
-          <string>ERP5TypeInformation</string>
-        </tuple>
-        <none/>
+        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/PortalTypeTemplateItem/portal_types/External%20Folder.xml b/bt5/erp5_forge/PortalTypeTemplateItem/portal_types/External%20Folder.xml
index 0456ba1d37..a12deb6230 100644
--- a/bt5/erp5_forge/PortalTypeTemplateItem/portal_types/External%20Folder.xml
+++ b/bt5/erp5_forge/PortalTypeTemplateItem/portal_types/External%20Folder.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.ERP5Type</string>
-          <string>ERP5TypeInformation</string>
-        </tuple>
-        <none/>
+        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/PortalTypeTemplateItem/portal_types/Glossary%20Module.xml b/bt5/erp5_forge/PortalTypeTemplateItem/portal_types/Glossary%20Module.xml
index d5655b198b..1e19d327e6 100644
--- a/bt5/erp5_forge/PortalTypeTemplateItem/portal_types/Glossary%20Module.xml
+++ b/bt5/erp5_forge/PortalTypeTemplateItem/portal_types/Glossary%20Module.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.ERP5Type</string>
-          <string>ERP5TypeInformation</string>
-        </tuple>
-        <none/>
+        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/PortalTypeTemplateItem/portal_types/Glossary%20Term.xml b/bt5/erp5_forge/PortalTypeTemplateItem/portal_types/Glossary%20Term.xml
index 55a275cd6c..cc26bb259f 100644
--- a/bt5/erp5_forge/PortalTypeTemplateItem/portal_types/Glossary%20Term.xml
+++ b/bt5/erp5_forge/PortalTypeTemplateItem/portal_types/Glossary%20Term.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.ERP5Type</string>
-          <string>ERP5TypeInformation</string>
-        </tuple>
-        <none/>
+        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/PortalTypeTemplateItem/portal_types/Upload%20Module.xml b/bt5/erp5_forge/PortalTypeTemplateItem/portal_types/Upload%20Module.xml
index 84bff90a1e..88ca03457f 100644
--- a/bt5/erp5_forge/PortalTypeTemplateItem/portal_types/Upload%20Module.xml
+++ b/bt5/erp5_forge/PortalTypeTemplateItem/portal_types/Upload%20Module.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.ERP5Type</string>
-          <string>ERP5TypeInformation</string>
-        </tuple>
-        <none/>
+        <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge.xml
index f7bce4693d..161c3ef2d4 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>OFS.Folder</string>
-          <string>Folder</string>
-        </tuple>
-        <none/>
+        <global name="Folder" module="OFS.Folder"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Base_getOriginalBusinessTemplateId.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Base_getOriginalBusinessTemplateId.xml
index 17d31bf6d2..9d8986e77b 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Base_getOriginalBusinessTemplateId.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Base_getOriginalBusinessTemplateId.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Base_getOrphanObjects.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Base_getOrphanObjects.xml
index 22a46f4946..5f42505c21 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Base_getOrphanObjects.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Base_getOrphanObjects.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Base_viewOrphanObjectList.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Base_viewOrphanObjectList.xml
index 22862afdc8..99820e15f4 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Base_viewOrphanObjectList.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Base_viewOrphanObjectList.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/BugModule_sendOpenBugListReminder.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/BugModule_sendOpenBugListReminder.xml
index c2e6e23510..e7807a3306 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/BugModule_sendOpenBugListReminder.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/BugModule_sendOpenBugListReminder.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -188,6 +185,7 @@ if bug_count:\n
                             <string>not_assigned_bug_list</string>
                             <string>_getiter_</string>
                             <string>bug</string>
+                            <string>_inplacevar_</string>
                             <string>assignee</string>
                             <string>bug_list</string>
                             <string>_getitem_</string>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/BugModule_viewBugList.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/BugModule_viewBugList.xml
index 9617e51be9..e26538410b 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/BugModule_viewBugList.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/BugModule_viewBugList.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_getFollowUpListAsText.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_getFollowUpListAsText.xml
index fc9d309fa4..f81afb9c07 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_getFollowUpListAsText.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_getFollowUpListAsText.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -172,6 +169,7 @@ return \'\\n\\n\'.join(follow_up_list)\n
                             <string>time</string>
                             <string>actor</string>
                             <string>comment_id</string>
+                            <string>_inplacevar_</string>
                           </tuple>
                         </value>
                     </item>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_view.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_view.xml
index 427516d4ec..bd1ee388ba 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_view.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_view/follow_up.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_view/follow_up.xml
index 4399f795a0..c2a8a1d974 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_view/follow_up.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_view/follow_up.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>TextAreaField</string>
-        </tuple>
-        <none/>
+        <global name="TextAreaField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_view/my_bug_difficulty.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_view/my_bug_difficulty.xml
index 6d2856adac..76377ea0b1 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_view/my_bug_difficulty.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_view/my_bug_difficulty.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>ListField</string>
-        </tuple>
-        <none/>
+        <global name="ListField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_view/my_id.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_view/my_id.xml
index a73555e66c..7a9ce07b94 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_view/my_id.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_view/my_id.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>StringField</string>
-        </tuple>
-        <none/>
+        <global name="StringField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_view/my_tested.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_view/my_tested.xml
index 9ab99a9a57..7e1160288c 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_view/my_tested.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_view/my_tested.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>CheckBoxField</string>
-        </tuple>
-        <none/>
+        <global name="CheckBoxField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_view/note.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_view/note.xml
index 716c810b63..d155497cf6 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_view/note.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/Bug_view/note.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>StringField</string>
-        </tuple>
-        <none/>
+        <global name="StringField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/ExternalFolder_view.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/ExternalFolder_view.xml
index c6d55cf109..7b6fabc1c2 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/ExternalFolder_view.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/ExternalFolder_view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/TemplateTool_searchPortalType.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/TemplateTool_searchPortalType.xml
index e822bb9afc..bd3288d7d1 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/TemplateTool_searchPortalType.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/TemplateTool_searchPortalType.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/TemplateTool_viewSearchPortalTypeDialog.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/TemplateTool_viewSearchPortalTypeDialog.xml
index d74fed1f05..8be0041e42 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/TemplateTool_viewSearchPortalTypeDialog.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/TemplateTool_viewSearchPortalTypeDialog.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -74,25 +71,25 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>bottom</string> </key>
+                    <key> <string>bottom</string> </key>
                     <value>
                       <list/>
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>center</string> </key>
+                    <key> <string>center</string> </key>
                     <value>
                       <list/>
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>hidden</string> </key>
+                    <key> <string>hidden</string> </key>
                     <value>
                       <list/>
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>left</string> </key>
+                    <key> <string>left</string> </key>
                     <value>
                       <list>
                         <string>your_portal_type</string>
@@ -100,7 +97,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>right</string> </key>
+                    <key> <string>right</string> </key>
                     <value>
                       <list/>
                     </value>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/diff.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/diff.xml
index 00181f37d8..e290d906ff 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/diff.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/diff.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary.xml
index ae395547af..a5f4a9549f 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>OFS.Folder</string>
-          <string>Folder</string>
-        </tuple>
-        <none/>
+        <global name="Folder" module="OFS.Folder"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewFieldAndTermComparisonDialog.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewFieldAndTermComparisonDialog.xml
index 94708b545c..46c73b84e7 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewFieldAndTermComparisonDialog.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewFieldAndTermComparisonDialog.xml
@@ -75,7 +75,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>bottom</string> </key>
+                    <key> <string>bottom</string> </key>
                     <value>
                       <list>
                         <string>listbox</string>
@@ -83,13 +83,13 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>center</string> </key>
+                    <key> <string>center</string> </key>
                     <value>
                       <list/>
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>hidden</string> </key>
+                    <key> <string>hidden</string> </key>
                     <value>
                       <list>
                         <string>listbox_term</string>
@@ -97,13 +97,13 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>left</string> </key>
+                    <key> <string>left</string> </key>
                     <value>
                       <list/>
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>right</string> </key>
+                    <key> <string>right</string> </key>
                     <value>
                       <list/>
                     </value>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewFieldUpdateDialog.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewFieldUpdateDialog.xml
index 3a63d6e0cd..bb32cd21b3 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewFieldUpdateDialog.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewFieldUpdateDialog.xml
@@ -75,25 +75,25 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>bottom</string> </key>
+                    <key> <string>bottom</string> </key>
                     <value>
                       <list/>
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>center</string> </key>
+                    <key> <string>center</string> </key>
                     <value>
                       <list/>
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>hidden</string> </key>
+                    <key> <string>hidden</string> </key>
                     <value>
                       <list/>
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>left</string> </key>
+                    <key> <string>left</string> </key>
                     <value>
                       <list>
                         <string>your_business_field_list</string>
@@ -101,7 +101,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>right</string> </key>
+                    <key> <string>right</string> </key>
                     <value>
                       <list/>
                     </value>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewGlossaryTermList/listbox.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewGlossaryTermList/listbox.xml
index b7edda530e..e8e4ef4735 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewGlossaryTermList/listbox.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewGlossaryTermList/listbox.xml
@@ -85,7 +85,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>all_columns</string> </key>
+                    <key> <string>all_columns</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -116,11 +116,11 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>anchor</string> </key>
+                    <key> <string>anchor</string> </key>
                     <value> <int>0</int> </value>
                 </item>
                 <item>
-                    <key>                 <string>columns</string> </key>
+                    <key> <string>columns</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -151,7 +151,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>domain_root_list</string> </key>
+                    <key> <string>domain_root_list</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -166,7 +166,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>domain_tree</string> </key>
+                    <key> <string>domain_tree</string> </key>
                     <value> <int>1</int> </value>
                 </item>
                 <item>
@@ -178,7 +178,7 @@
                     <value> <string>Base_viewFieldLibrary</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>portal_types</string> </key>
+                    <key> <string>portal_types</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -189,7 +189,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>search_columns</string> </key>
+                    <key> <string>search_columns</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -220,11 +220,11 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>selection_name</string> </key>
+                    <key> <string>selection_name</string> </key>
                     <value> <string>glossary_module_selection</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>sort</string> </key>
+                    <key> <string>sort</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -235,7 +235,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>sort_columns</string> </key>
+                    <key> <string>sort_columns</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -270,7 +270,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Terms</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewPOFileExportDialog.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewPOFileExportDialog.xml
index 250ee6a755..b855625d4a 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewPOFileExportDialog.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewPOFileExportDialog.xml
@@ -75,25 +75,25 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>bottom</string> </key>
+                    <key> <string>bottom</string> </key>
                     <value>
                       <list/>
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>center</string> </key>
+                    <key> <string>center</string> </key>
                     <value>
                       <list/>
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>hidden</string> </key>
+                    <key> <string>hidden</string> </key>
                     <value>
                       <list/>
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>left</string> </key>
+                    <key> <string>left</string> </key>
                     <value>
                       <list>
                         <string>your_business_field_list</string>
@@ -102,7 +102,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>right</string> </key>
+                    <key> <string>right</string> </key>
                     <value>
                       <list/>
                     </value>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewTermListCreationDialog.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewTermListCreationDialog.xml
index d75c330d8a..ab02456ce2 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewTermListCreationDialog.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewTermListCreationDialog.xml
@@ -75,25 +75,25 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>bottom</string> </key>
+                    <key> <string>bottom</string> </key>
                     <value>
                       <list/>
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>center</string> </key>
+                    <key> <string>center</string> </key>
                     <value>
                       <list/>
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>hidden</string> </key>
+                    <key> <string>hidden</string> </key>
                     <value>
                       <list/>
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>left</string> </key>
+                    <key> <string>left</string> </key>
                     <value>
                       <list>
                         <string>your_language</string>
@@ -101,7 +101,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>right</string> </key>
+                    <key> <string>right</string> </key>
                     <value>
                       <list/>
                     </value>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryTerm_view/my_business_field.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryTerm_view/my_business_field.xml
index 0ec442715e..b6423dbeff 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryTerm_view/my_business_field.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryTerm_view/my_business_field.xml
@@ -65,7 +65,7 @@
                     <value> <string></string> </value>
                 </item>
                 <item>
-                    <key>                 <string>items</string> </key>
+                    <key> <string>items</string> </key>
                     <value>
                       <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
                     </value>
@@ -94,7 +94,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Business Field</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryTerm_view/my_description.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryTerm_view/my_description.xml
index d0d6f45546..6813057e99 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryTerm_view/my_description.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryTerm_view/my_description.xml
@@ -87,7 +87,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>whitespace_preserve</string> </key>
+                    <key> <string>whitespace_preserve</string> </key>
                     <value> <int>0</int> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryTerm_view/my_language.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryTerm_view/my_language.xml
index 56b47d43b0..b7bd0337d9 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryTerm_view/my_language.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryTerm_view/my_language.xml
@@ -65,7 +65,7 @@
                     <value> <string></string> </value>
                 </item>
                 <item>
-                    <key>                 <string>items</string> </key>
+                    <key> <string>items</string> </key>
                     <value>
                       <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
                     </value>
@@ -94,7 +94,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Language</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryTerm_view/my_reference.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryTerm_view/my_reference.xml
index 21917c880d..6c8c8d2d79 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryTerm_view/my_reference.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryTerm_view/my_reference.xml
@@ -87,7 +87,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Reference</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn.xml
index 3811c22d3c..734fb53e32 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>OFS.Folder</string>
-          <string>Folder</string>
-        </tuple>
-        <none/>
+        <global name="Folder" module="OFS.Folder"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_LogListMethod.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_LogListMethod.xml
index 636db73ffd..f6ac8c99d1 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_LogListMethod.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_LogListMethod.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnCleanup.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnCleanup.xml
index 0c204eca1b..8d9a6985e2 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnCleanup.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnCleanup.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnCommit.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnCommit.xml
index 08d1e469b3..a33fd20162 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnCommit.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnCommit.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnDiff.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnDiff.xml
index 41bc5fadee..6b2f648d89 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnDiff.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnDiff.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnInfo.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnInfo.xml
index 2dae3739a5..d758272bf0 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnInfo.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnInfo.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnListConflicted.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnListConflicted.xml
index 5491fad86f..f914be986f 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnListConflicted.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnListConflicted.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnListUnversioned.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnListUnversioned.xml
index 2d490f718c..56cc3faeac 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnListUnversioned.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnListUnversioned.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnLog.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnLog.xml
index b4d462a122..abe94df969 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnLog.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnLog.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnLogGlobal.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnLogGlobal.xml
index 8a207c021c..77147b15a2 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnLogGlobal.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnLogGlobal.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnLogin.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnLogin.xml
index c9e531d1dc..7a35f218d8 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnLogin.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnLogin.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnLs.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnLs.xml
index 269d843a4f..4e622d1263 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnLs.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnLs.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnMultiDiff.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnMultiDiff.xml
index 612848d8e2..f811ca65cb 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnMultiDiff.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnMultiDiff.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -141,6 +138,7 @@ return context.asContext(diff=diff).BusinessTemplate_viewSvnMultiDiff()\n
                             <string>revisions_list</string>
                             <string>len</string>
                             <string>diff</string>
+                            <string>_inplacevar_</string>
                           </tuple>
                         </value>
                     </item>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnRemoveFiles.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnRemoveFiles.xml
index 647d0a0b03..56b9fc3db0 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnRemoveFiles.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnRemoveFiles.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnResolvedFiles.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnResolvedFiles.xml
index 2271e7f4ed..61e405071e 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnResolvedFiles.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnResolvedFiles.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnRevert.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnRevert.xml
index b2bc236f63..dce2fb18be 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnRevert.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnRevert.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnSslTrust.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnSslTrust.xml
index 4f2188d54f..9d20d67fb3 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnSslTrust.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnSslTrust.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnUpdate.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnUpdate.xml
index fbf97794fc..9ccb63aad4 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnUpdate.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnUpdate.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnUpdateKeep.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnUpdateKeep.xml
index 8f6c89dd72..1679ebf717 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnUpdateKeep.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnUpdateKeep.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewConflicted.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewConflicted.xml
index 751fc4fc21..a0105593fd 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewConflicted.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewConflicted.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnChangelog.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnChangelog.xml
index ac42634dad..cba25274ae 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnChangelog.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnChangelog.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnInfos.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnInfos.xml
index fabeffa745..1818ca1160 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnInfos.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnInfos.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PageTemplates.ZopePageTemplate</string>
-          <string>ZopePageTemplate</string>
-        </tuple>
-        <none/>
+        <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnInfosFile.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnInfosFile.xml
index ad88fb28c9..55bed8e119 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnInfosFile.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnInfosFile.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PageTemplates.ZopePageTemplate</string>
-          <string>ZopePageTemplate</string>
-        </tuple>
-        <none/>
+        <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnLog.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnLog.xml
index e94c190b03..6615f40fdc 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnLog.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnLog.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnLogin.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnLogin.xml
index 0b964c2652..81b31df9b0 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnLogin.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnLogin.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnMultiDiff.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnMultiDiff.xml
index 0729a02a0a..b6f5d827d1 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnMultiDiff.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnMultiDiff.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PageTemplates.ZopePageTemplate</string>
-          <string>ZopePageTemplate</string>
-        </tuple>
-        <none/>
+        <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnSSLTrust.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnSSLTrust.xml
index 5ba683b622..5b88b2cae0 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnSSLTrust.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnSSLTrust.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnShowFile.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnShowFile.xml
index 74390e9dad..6696de8d44 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnShowFile.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnShowFile.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PageTemplates.ZopePageTemplate</string>
-          <string>ZopePageTemplate</string>
-        </tuple>
-        <none/>
+        <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewUnversioned.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewUnversioned.xml
index e3e05a0d4b..a717696fd6 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewUnversioned.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewUnversioned.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_dhtmlXCommon.js.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_dhtmlXCommon.js.xml
index 2c0c6c46ef..85f3590a45 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_dhtmlXCommon.js.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_dhtmlXCommon.js.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>OFS.Image</string>
-          <string>File</string>
-        </tuple>
-        <none/>
+        <global name="File" module="OFS.Image"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_dhtmlXTree.css.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_dhtmlXTree.css.xml
index 8f971e4e3c..00e68fb541 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_dhtmlXTree.css.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_dhtmlXTree.css.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>OFS.Image</string>
-          <string>File</string>
-        </tuple>
-        <none/>
+        <global name="File" module="OFS.Image"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_dhtmlXTree.js.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_dhtmlXTree.js.xml
index ed0a1e2e0a..d8ef61f07e 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_dhtmlXTree.js.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_dhtmlXTree.js.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>OFS.Image</string>
-          <string>File</string>
-        </tuple>
-        <none/>
+        <global name="File" module="OFS.Image"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_doCreateJavaScriptDiff.js.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_doCreateJavaScriptDiff.js.xml
index bba3e94084..294a6f1fa7 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_doCreateJavaScriptDiff.js.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_doCreateJavaScriptDiff.js.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_doCreateJavaScriptStatus.js.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_doCreateJavaScriptStatus.js.xml
index 6ffedafbb2..528ae1f9c9 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_doCreateJavaScriptStatus.js.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_doCreateJavaScriptStatus.js.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs.xml
index bd00773948..b518950eb9 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>OFS.Folder</string>
-          <string>Folder</string>
-        </tuple>
-        <none/>
+        <global name="Folder" module="OFS.Folder"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/altbuttons.gif.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/altbuttons.gif.xml
index 2d5a4a646d..11a390edbc 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/altbuttons.gif.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/altbuttons.gif.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>OFS.Image</string>
-          <string>Image</string>
-        </tuple>
-        <none/>
+        <global name="Image" module="OFS.Image"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/altbuttonslow.gif.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/altbuttonslow.gif.xml
index 6bbccecc36..1468f604d1 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/altbuttonslow.gif.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/altbuttonslow.gif.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>OFS.Image</string>
-          <string>Image</string>
-        </tuple>
-        <none/>
+        <global name="Image" module="OFS.Image"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/blank.gif.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/blank.gif.xml
index e057a680cc..aa29d46309 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/blank.gif.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/blank.gif.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>OFS.Image</string>
-          <string>Image</string>
-        </tuple>
-        <none/>
+        <global name="Image" module="OFS.Image"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/captionoff.png.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/captionoff.png.xml
index e13a5ba2a6..1fa1ed1e71 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/captionoff.png.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/captionoff.png.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>OFS.Image</string>
-          <string>Image</string>
-        </tuple>
-        <none/>
+        <global name="Image" module="OFS.Image"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/captionon.png.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/captionon.png.xml
index 3990b054d4..4f3e8f092c 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/captionon.png.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/captionon.png.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>OFS.Image</string>
-          <string>Image</string>
-        </tuple>
-        <none/>
+        <global name="Image" module="OFS.Image"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/diffoff.png.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/diffoff.png.xml
index f6edd62613..296edb8b1d 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/diffoff.png.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/diffoff.png.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>OFS.Image</string>
-          <string>Image</string>
-        </tuple>
-        <none/>
+        <global name="Image" module="OFS.Image"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/diffon.png.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/diffon.png.xml
index 69c56cec7d..ca4cca2b5e 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/diffon.png.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/diffon.png.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>OFS.Image</string>
-          <string>Image</string>
-        </tuple>
-        <none/>
+        <global name="Image" module="OFS.Image"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/document.png.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/document.png.xml
index 1b493f7bf7..a3f0a5d6ad 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/document.png.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/document.png.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>OFS.Image</string>
-          <string>Image</string>
-        </tuple>
-        <none/>
+        <global name="Image" module="OFS.Image"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/edit.png.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/edit.png.xml
index 28371e3bea..ac77f8f099 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/edit.png.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/edit.png.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>OFS.Image</string>
-          <string>Image</string>
-        </tuple>
-        <none/>
+        <global name="Image" module="OFS.Image"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/execoff.png.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/execoff.png.xml
index f5ab2dad04..5cbd611650 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/execoff.png.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/execoff.png.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>OFS.Image</string>
-          <string>Image</string>
-        </tuple>
-        <none/>
+        <global name="Image" module="OFS.Image"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/execon.png.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/execon.png.xml
index 16dd7a44fd..11c2116a2c 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/execon.png.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/execon.png.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>OFS.Image</string>
-          <string>Image</string>
-        </tuple>
-        <none/>
+        <global name="Image" module="OFS.Image"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/expandoff.png.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/expandoff.png.xml
index c8bc3e55cb..4c4cb13524 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/expandoff.png.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/expandoff.png.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>OFS.Image</string>
-          <string>Image</string>
-        </tuple>
-        <none/>
+        <global name="Image" module="OFS.Image"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/expandon.png.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/expandon.png.xml
index 325e6ff2e4..d6e3736481 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/expandon.png.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/expandon.png.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>OFS.Image</string>
-          <string>Image</string>
-        </tuple>
-        <none/>
+        <global name="Image" module="OFS.Image"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/folder.png.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/folder.png.xml
index 8173a03242..76d0bcde44 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/folder.png.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/folder.png.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>OFS.Image</string>
-          <string>Image</string>
-        </tuple>
-        <none/>
+        <global name="Image" module="OFS.Image"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/folder_open.png.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/folder_open.png.xml
index a16c0644bf..783ab5d123 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/folder_open.png.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/folder_open.png.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>OFS.Image</string>
-          <string>Image</string>
-        </tuple>
-        <none/>
+        <global name="Image" module="OFS.Image"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/iconCheckAll.gif.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/iconCheckAll.gif.xml
index 5842c65885..75d3c7fcad 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/iconCheckAll.gif.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/iconCheckAll.gif.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>OFS.Image</string>
-          <string>Image</string>
-        </tuple>
-        <none/>
+        <global name="Image" module="OFS.Image"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/iconCheckGray.gif.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/iconCheckGray.gif.xml
index da811971be..e040194117 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/iconCheckGray.gif.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/iconCheckGray.gif.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>OFS.Image</string>
-          <string>Image</string>
-        </tuple>
-        <none/>
+        <global name="Image" module="OFS.Image"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/iconUnCheckAll.gif.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/iconUnCheckAll.gif.xml
index 9432504c14..4cc07cfd8a 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/iconUnCheckAll.gif.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/iconUnCheckAll.gif.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>OFS.Image</string>
-          <string>Image</string>
-        </tuple>
-        <none/>
+        <global name="Image" module="OFS.Image"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/line1.gif.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/line1.gif.xml
index 083dc8524d..657c69197a 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/line1.gif.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/line1.gif.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>OFS.Image</string>
-          <string>Image</string>
-        </tuple>
-        <none/>
+        <global name="Image" module="OFS.Image"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/line2.gif.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/line2.gif.xml
index cc0fe3a6ef..7fea554a63 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/line2.gif.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/line2.gif.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>OFS.Image</string>
-          <string>Image</string>
-        </tuple>
-        <none/>
+        <global name="Image" module="OFS.Image"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/line3.gif.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/line3.gif.xml
index dbd76ae9a5..c56c488507 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/line3.gif.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/line3.gif.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>OFS.Image</string>
-          <string>Image</string>
-        </tuple>
-        <none/>
+        <global name="Image" module="OFS.Image"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/line4.gif.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/line4.gif.xml
index 6a3924f924..5ce573b83c 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/line4.gif.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/line4.gif.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>OFS.Image</string>
-          <string>Image</string>
-        </tuple>
-        <none/>
+        <global name="Image" module="OFS.Image"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/minus.gif.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/minus.gif.xml
index af4082b20e..780264b758 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/minus.gif.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/minus.gif.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>OFS.Image</string>
-          <string>Image</string>
-        </tuple>
-        <none/>
+        <global name="Image" module="OFS.Image"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/minus2.gif.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/minus2.gif.xml
index ef74e1e1e4..90a17f2266 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/minus2.gif.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/minus2.gif.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>OFS.Image</string>
-          <string>Image</string>
-        </tuple>
-        <none/>
+        <global name="Image" module="OFS.Image"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/minus3.gif.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/minus3.gif.xml
index 300b070921..77ace0f1a5 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/minus3.gif.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/minus3.gif.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>OFS.Image</string>
-          <string>Image</string>
-        </tuple>
-        <none/>
+        <global name="Image" module="OFS.Image"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/minus4.gif.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/minus4.gif.xml
index facf88a4b1..a956725697 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/minus4.gif.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/minus4.gif.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>OFS.Image</string>
-          <string>Image</string>
-        </tuple>
-        <none/>
+        <global name="Image" module="OFS.Image"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/minus5.gif.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/minus5.gif.xml
index 42d10ef465..48ee0bdd15 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/minus5.gif.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/minus5.gif.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>OFS.Image</string>
-          <string>Image</string>
-        </tuple>
-        <none/>
+        <global name="Image" module="OFS.Image"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/minus_ar.gif.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/minus_ar.gif.xml
index f47af0ff73..f73950e5a2 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/minus_ar.gif.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/minus_ar.gif.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>OFS.Image</string>
-          <string>Image</string>
-        </tuple>
-        <none/>
+        <global name="Image" module="OFS.Image"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/plus.gif.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/plus.gif.xml
index 83a151e30b..5065436285 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/plus.gif.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/plus.gif.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>OFS.Image</string>
-          <string>Image</string>
-        </tuple>
-        <none/>
+        <global name="Image" module="OFS.Image"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/plus2.gif.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/plus2.gif.xml
index 15ac7a8e1c..7ea004524b 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/plus2.gif.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/plus2.gif.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>OFS.Image</string>
-          <string>Image</string>
-        </tuple>
-        <none/>
+        <global name="Image" module="OFS.Image"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/plus3.gif.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/plus3.gif.xml
index a9a56c8d47..d79c4232ad 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/plus3.gif.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/plus3.gif.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>OFS.Image</string>
-          <string>Image</string>
-        </tuple>
-        <none/>
+        <global name="Image" module="OFS.Image"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/plus4.gif.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/plus4.gif.xml
index b9356cc518..2658f6a6f9 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/plus4.gif.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/plus4.gif.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>OFS.Image</string>
-          <string>Image</string>
-        </tuple>
-        <none/>
+        <global name="Image" module="OFS.Image"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/plus5.gif.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/plus5.gif.xml
index 114b7a5692..95b444d5f2 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/plus5.gif.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/plus5.gif.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>OFS.Image</string>
-          <string>Image</string>
-        </tuple>
-        <none/>
+        <global name="Image" module="OFS.Image"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/plus_ar.gif.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/plus_ar.gif.xml
index db843ad432..75473b98ba 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/plus_ar.gif.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/plus_ar.gif.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>OFS.Image</string>
-          <string>Image</string>
-        </tuple>
-        <none/>
+        <global name="Image" module="OFS.Image"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/revertoff.png.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/revertoff.png.xml
index 1bb11cbd13..58c1faec2c 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/revertoff.png.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/revertoff.png.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>OFS.Image</string>
-          <string>Image</string>
-        </tuple>
-        <none/>
+        <global name="Image" module="OFS.Image"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/reverton.png.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/reverton.png.xml
index 399a771ae7..a4aaa073a5 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/reverton.png.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/reverton.png.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>OFS.Image</string>
-          <string>Image</string>
-        </tuple>
-        <none/>
+        <global name="Image" module="OFS.Image"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/trashoff.png.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/trashoff.png.xml
index 1d6fcb8f68..92adb4fe7e 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/trashoff.png.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/trashoff.png.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>OFS.Image</string>
-          <string>Image</string>
-        </tuple>
-        <none/>
+        <global name="Image" module="OFS.Image"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/trashon.png.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/trashon.png.xml
index 4af7e70b40..cd2fcf2b3b 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/trashon.png.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/trashon.png.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>OFS.Image</string>
-          <string>Image</string>
-        </tuple>
-        <none/>
+        <global name="Image" module="OFS.Image"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/wait.gif.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/wait.gif.xml
index dff61c24b4..8b255ca5bf 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/wait.gif.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_imgs/wait.gif.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>OFS.Image</string>
-          <string>Image</string>
-        </tuple>
-        <none/>
+        <global name="Image" module="OFS.Image"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_menuico.js.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_menuico.js.xml
index ec44253a3f..1db7d03895 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_menuico.js.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_menuico.js.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>OFS.Image</string>
-          <string>File</string>
-        </tuple>
-        <none/>
+        <global name="File" module="OFS.Image"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_movableMenu.css.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_movableMenu.css.xml
index 1c88d793e1..c6155c3ef1 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_movableMenu.css.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_movableMenu.css.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>OFS.Image</string>
-          <string>File</string>
-        </tuple>
-        <none/>
+        <global name="File" module="OFS.Image"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_movableMenu.js.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_movableMenu.js.xml
index 6f821571b4..b4a105e2f3 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_movableMenu.js.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_movableMenu.js.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>OFS.Image</string>
-          <string>File</string>
-        </tuple>
-        <none/>
+        <global name="File" module="OFS.Image"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/Preference_viewSubversion.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/Preference_viewSubversion.xml
index 5a010eb4d3..47dedc6159 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/Preference_viewSubversion.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/Preference_viewSubversion.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/tree.xml.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/tree.xml.xml
index 6b2b06639a..8eedcc710c 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/tree.xml.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/tree.xml.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox.xml
index 6a878e5b44..0f64d7a049 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>OFS.Folder</string>
-          <string>Folder</string>
-        </tuple>
-        <none/>
+        <global name="Folder" module="OFS.Folder"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/Base_getFunctionFirstArgumentValue.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/Base_getFunctionFirstArgumentValue.xml
index 4dd9a84b4e..71569fc9be 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/Base_getFunctionFirstArgumentValue.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/Base_getFunctionFirstArgumentValue.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ExternalMethod.ExternalMethod</string>
-          <string>ExternalMethod</string>
-        </tuple>
-        <none/>
+        <global name="ExternalMethod" module="Products.ExternalMethod.ExternalMethod"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/Base_getSimulationTree.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/Base_getSimulationTree.xml
index 537ae6392c..d6ee32a54a 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/Base_getSimulationTree.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/Base_getSimulationTree.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/Base_viewSimulationTree.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/Base_viewSimulationTree.xml
index 95f1d43c9f..9722c66508 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/Base_viewSimulationTree.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/Base_viewSimulationTree.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -138,7 +135,7 @@ return printed\n
                             <string>_print_</string>
                             <string>_print</string>
                             <string>_getattr_</string>
-<string>context</string>
+                            <string>context</string>
                             <string>simulations_found</string>
                             <string>len</string>
                             <string>_getiter_</string>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/ERP5Site_showAllUsedSelectionNames.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/ERP5Site_showAllUsedSelectionNames.xml
index 3ac8df1127..0456267ec8 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/ERP5Site_showAllUsedSelectionNames.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/ERP5Site_showAllUsedSelectionNames.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/SkinsTool_checkDuplicateSelectionName.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/SkinsTool_checkDuplicateSelectionName.xml
index 992f7b02f7..cb7beec70e 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/SkinsTool_checkDuplicateSelectionName.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/SkinsTool_checkDuplicateSelectionName.xml
@@ -139,7 +139,7 @@ return printed\n
                             <string>_print_</string>
                             <string>_print</string>
                             <string>_getattr_</string>
-<string>context</string>
+                            <string>context</string>
                             <string>skins_tool</string>
                             <string>dict</string>
                             <string>selection_name_dict</string>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/SkinsTool_listDuplicateSkins.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/SkinsTool_listDuplicateSkins.xml
index 2475f93c18..cc12a7527d 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/SkinsTool_listDuplicateSkins.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/SkinsTool_listDuplicateSkins.xml
@@ -271,7 +271,7 @@ return printed\n
                             <string>_print_</string>
                             <string>_print</string>
                             <string>_getattr_</string>
-<string>context</string>
+                            <string>context</string>
                             <string>stool</string>
                             <string>skins_by_name</string>
                             <string>_getiter_</string>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/grep.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/grep.xml
index 43b8cf1dbc..8e6182deab 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/grep.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/grep.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ExternalMethod.ExternalMethod</string>
-          <string>ExternalMethod</string>
-        </tuple>
-        <none/>
+        <global name="ExternalMethod" module="Products.ExternalMethod.ExternalMethod"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow.xml b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow.xml
index a486b779e3..4db89101d7 100644
--- a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow.xml
+++ b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.DCWorkflow</string>
-          <string>DCWorkflowDefinition</string>
-        </tuple>
-        <none/>
+        <global name="DCWorkflowDefinition" module="Products.DCWorkflow.DCWorkflow"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/scripts.xml b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/scripts.xml
index c5f5085430..34ddf5a001 100644
--- a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/scripts.xml
+++ b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/scripts.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Scripts</string>
-          <string>Scripts</string>
-        </tuple>
-        <none/>
+        <global name="Scripts" module="Products.DCWorkflow.Scripts"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/scripts/confirmTested.xml b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/scripts/confirmTested.xml
index 0810121779..31c9bb84bd 100644
--- a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/scripts/confirmTested.xml
+++ b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/scripts/confirmTested.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/scripts/sendNotification.xml b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/scripts/sendNotification.xml
index 279388f568..0c55608e27 100644
--- a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/scripts/sendNotification.xml
+++ b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/scripts/sendNotification.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/scripts/setCloseDate.xml b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/scripts/setCloseDate.xml
index 05e4c706c4..f408e57116 100644
--- a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/scripts/setCloseDate.xml
+++ b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/scripts/setCloseDate.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/states.xml b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/states.xml
index 9653d814da..ddb880987e 100644
--- a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/states.xml
+++ b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/states.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.States</string>
-          <string>States</string>
-        </tuple>
-        <none/>
+        <global name="States" module="Products.DCWorkflow.States"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/states/cancelled.xml b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/states/cancelled.xml
index 56f5e2a7de..3f8228d237 100644
--- a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/states/cancelled.xml
+++ b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/states/cancelled.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.States</string>
-          <string>StateDefinition</string>
-        </tuple>
-        <none/>
+        <global name="StateDefinition" module="Products.DCWorkflow.States"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/states/closed.xml b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/states/closed.xml
index 8e0f45ce3e..69b88cf7af 100644
--- a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/states/closed.xml
+++ b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/states/closed.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.States</string>
-          <string>StateDefinition</string>
-        </tuple>
-        <none/>
+        <global name="StateDefinition" module="Products.DCWorkflow.States"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/states/draft.xml b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/states/draft.xml
index 1ff0ae7940..d2e057f820 100644
--- a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/states/draft.xml
+++ b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/states/draft.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.States</string>
-          <string>StateDefinition</string>
-        </tuple>
-        <none/>
+        <global name="StateDefinition" module="Products.DCWorkflow.States"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/states/open.xml b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/states/open.xml
index 2c7632fbdc..c23a2090c7 100644
--- a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/states/open.xml
+++ b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/states/open.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.States</string>
-          <string>StateDefinition</string>
-        </tuple>
-        <none/>
+        <global name="StateDefinition" module="Products.DCWorkflow.States"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/transitions.xml b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/transitions.xml
index eec7ba7928..eb34805c27 100644
--- a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/transitions.xml
+++ b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/transitions.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>Transitions</string>
-        </tuple>
-        <none/>
+        <global name="Transitions" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/transitions/cancel.xml b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/transitions/cancel.xml
index 67ac680fac..c0aa29b604 100644
--- a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/transitions/cancel.xml
+++ b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/transitions/cancel.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>TransitionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/transitions/cancel_action.xml b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/transitions/cancel_action.xml
index 34fd65364e..00bbece16e 100644
--- a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/transitions/cancel_action.xml
+++ b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/transitions/cancel_action.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>TransitionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/transitions/close.xml b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/transitions/close.xml
index 6d7c47583f..801a53a92f 100644
--- a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/transitions/close.xml
+++ b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/transitions/close.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>TransitionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/transitions/close_action.xml b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/transitions/close_action.xml
index e2646abbf0..a9fba449b9 100644
--- a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/transitions/close_action.xml
+++ b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/transitions/close_action.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>TransitionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/transitions/follow.xml b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/transitions/follow.xml
index e920b6cf47..7893c99613 100644
--- a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/transitions/follow.xml
+++ b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/transitions/follow.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>TransitionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/transitions/follow_action.xml b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/transitions/follow_action.xml
index fecdce250d..9da4637226 100644
--- a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/transitions/follow_action.xml
+++ b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/transitions/follow_action.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>TransitionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/transitions/open.xml b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/transitions/open.xml
index ede6ed7f94..7bfb8a1f23 100644
--- a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/transitions/open.xml
+++ b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/transitions/open.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>TransitionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/transitions/open_action.xml b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/transitions/open_action.xml
index 5b7d94f5bc..0ff46e7e75 100644
--- a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/transitions/open_action.xml
+++ b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/transitions/open_action.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>TransitionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/transitions/reopen.xml b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/transitions/reopen.xml
index 2f248d5989..434cad3819 100644
--- a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/transitions/reopen.xml
+++ b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/transitions/reopen.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>TransitionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/transitions/reopen_action.xml b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/transitions/reopen_action.xml
index 45f6e009f3..2bb3fb15e8 100644
--- a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/transitions/reopen_action.xml
+++ b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/transitions/reopen_action.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>TransitionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/variables.xml b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/variables.xml
index d36f9e73c8..b436e9ccb1 100644
--- a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/variables.xml
+++ b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/variables.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>Variables</string>
-        </tuple>
-        <none/>
+        <global name="Variables" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/variables/action.xml b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/variables/action.xml
index e2d54b25d7..259c80afcf 100644
--- a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/variables/action.xml
+++ b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/variables/action.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>VariableDefinition</string>
-        </tuple>
-        <none/>
+        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/variables/actor.xml b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/variables/actor.xml
index b81346a188..d61e0797ec 100644
--- a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/variables/actor.xml
+++ b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/variables/actor.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>VariableDefinition</string>
-        </tuple>
-        <none/>
+        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/variables/comment.xml b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/variables/comment.xml
index 05ac72139e..17628b77ae 100644
--- a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/variables/comment.xml
+++ b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/variables/comment.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>VariableDefinition</string>
-        </tuple>
-        <none/>
+        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/variables/error_message.xml b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/variables/error_message.xml
index e8fe8e44b8..d2c23e64f2 100644
--- a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/variables/error_message.xml
+++ b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/variables/error_message.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>VariableDefinition</string>
-        </tuple>
-        <none/>
+        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/variables/history.xml b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/variables/history.xml
index 2a212275cf..67134b997c 100644
--- a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/variables/history.xml
+++ b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/variables/history.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>VariableDefinition</string>
-        </tuple>
-        <none/>
+        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/variables/portal_type.xml b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/variables/portal_type.xml
index aaacee8edc..b989d55a52 100644
--- a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/variables/portal_type.xml
+++ b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/variables/portal_type.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>VariableDefinition</string>
-        </tuple>
-        <none/>
+        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/variables/time.xml b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/variables/time.xml
index a389129998..60befb96fa 100644
--- a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/variables/time.xml
+++ b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/variables/time.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>VariableDefinition</string>
-        </tuple>
-        <none/>
+        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/worklists.xml b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/worklists.xml
index 055366cf24..13d4865218 100644
--- a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/worklists.xml
+++ b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/worklists.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Worklists</string>
-          <string>Worklists</string>
-        </tuple>
-        <none/>
+        <global name="Worklists" module="Products.DCWorkflow.Worklists"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/worklists/open_bug.xml b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/worklists/open_bug.xml
index e927465b6e..95e025bf2e 100644
--- a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/worklists/open_bug.xml
+++ b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/worklists/open_bug.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Worklists</string>
-          <string>WorklistDefinition</string>
-        </tuple>
-        <none/>
+        <global name="WorklistDefinition" module="Products.DCWorkflow.Worklists"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_forge/bt/revision b/bt5/erp5_forge/bt/revision
index 1e3852840b..b7c52fb181 100644
--- a/bt5/erp5_forge/bt/revision
+++ b/bt5/erp5_forge/bt/revision
@@ -1 +1 @@
-211
\ No newline at end of file
+212
\ No newline at end of file
-- 
2.30.9