From 26ca885e80453abf0fc9438071d532bab5aae3e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9rome=20Perrin?= <jerome@nexedi.com>
Date: Fri, 30 Nov 2007 17:45:07 +0000
Subject: [PATCH] Only changes in XML format

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@17935 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
 .../erp5_base/Address_viewFieldLibrary.xml    |  7 ++----
 .../Address_viewFieldLibrary/my_city.xml      |  4 ++--
 .../Address_viewFieldLibrary/my_region.xml    |  6 ++---
 .../my_street_address.xml                     | 12 +++++-----
 .../Address_viewFieldLibrary/my_zip_code.xml  |  6 ++---
 .../erp5_base/AgentPrivilege_view.xml         |  7 ++----
 .../portal_skins/erp5_base/Agent_view.xml     |  7 ++----
 .../Agent_viewFullSizedSignature.xml          |  7 ++----
 .../Agent_viewImportSignatureDialog.xml       |  7 ++----
 .../erp5_base/Assignment_view.xml             |  7 ++----
 .../erp5_base/Assignment_viewFieldLibrary.xml |  7 ++----
 .../my_activity.xml                           |  6 ++---
 .../my_destination_project_title.xml          |  8 +++----
 .../my_destination_title.xml                  |  8 +++----
 .../my_function.xml                           |  6 ++---
 .../Assignment_viewFieldLibrary/my_group.xml  |  6 ++---
 .../Assignment_viewFieldLibrary/my_site.xml   |  6 ++---
 .../my_start_date.xml                         |  4 ++--
 .../my_stop_date.xml                          |  4 ++--
 .../Assignment_viewFieldLibrary/my_title.xml  |  4 ++--
 .../erp5_base/BankAccount_getReference.xml    |  7 ++----
 .../erp5_base/BankAccount_view.xml            |  7 ++----
 .../BankAccount_viewFieldLibrary.xml          |  7 ++----
 .../BankAccount_viewFieldLibrary/listbox.xml  |  8 +++----
 .../my_bank_account_holder_name.xml           |  4 ++--
 .../my_bank_account_key.xml                   |  4 ++--
 .../my_bank_account_number.xml                |  4 ++--
 .../my_bank_code.xml                          |  6 ++---
 .../my_bank_country_code.xml                  |  8 +++----
 .../my_branch.xml                             |  4 ++--
 .../my_source_title.xml                       |  8 +++----
 .../my_start_date.xml                         |  4 ++--
 .../my_stop_date.xml                          |  4 ++--
 .../BankAccount_viewFieldLibrary/my_title.xml |  8 +++----
 .../portal_skins/erp5_base/Base_changeId.xml  |  7 ++----
 .../portal_skins/erp5_base/Base_newQuery.xml  |  7 ++----
 .../erp5_base/Base_viewChangeIdDialog.xml     | 17 ++++++--------
 .../erp5_base/Base_viewPostQueryDialog.xml    |  7 ++----
 .../erp5_base/Base_viewSecurity.xml           |  7 ++----
 .../erp5_base/Career_viewFieldLibrary.xml     |  7 ++----
 .../Career_viewFieldLibrary/my_activity.xml   |  6 ++---
 .../my_collective_agreement_title.xml         |  4 ++--
 .../Career_viewFieldLibrary/my_function.xml   | 16 +++++++-------
 .../Career_viewFieldLibrary/my_grade.xml      |  6 ++---
 .../Career_viewFieldLibrary/my_role.xml       |  6 ++---
 .../my_salary_level.xml                       |  4 ++--
 .../Career_viewFieldLibrary/my_skill_list.xml |  6 ++---
 .../Career_viewFieldLibrary/my_start_date.xml |  4 ++--
 .../Career_viewFieldLibrary/my_stop_date.xml  |  4 ++--
 .../my_subordination_title.xml                | 10 ++++-----
 .../Career_viewFieldLibrary/my_title.xml      | 11 ++++------
 .../erp5_base/Coordinate_asURL.xml            |  7 ++----
 .../erp5_base/Coordinate_viewFieldLibrary.xml |  7 ++----
 .../my_int_index.xml                          |  8 +++----
 .../my_translated_id.xml                      |  6 ++---
 .../erp5_base/CreditCard_view.xml             |  7 ++----
 .../CreditCard_view/my_bank_account_key.xml   |  4 ++--
 .../CreditCard_view/my_bank_code.xml          |  4 ++--
 .../CurrencyExchangeLine_asCellRange.xml      |  7 ++----
 .../CurrencyExchangeLine_view/listbox.xml     | 14 ++++++------
 .../my_base_price.xml                         |  6 ++---
 .../my_price_currency_title.xml               | 14 ++++++------
 .../my_source_title.xml                       |  6 ++---
 .../CurrencyExchangeLine_view/my_title.xml    |  2 +-
 .../CurrencyModule_viewCurrencyList.xml       |  7 ++----
 .../listbox.xml                               | 12 +++++-----
 .../erp5_base/Currency_view/listbox.xml       | 10 ++++-----
 .../erp5_base/Currency_viewFieldLibrary.xml   | 17 ++++++--------
 .../my_base_unit_quantity.xml                 |  7 ++----
 .../my_reference.xml                          | 15 +++++--------
 .../my_short_title.xml                        | 11 ++++------
 .../my_start_date.xml                         | 13 +++++------
 .../my_stop_date.xml                          | 13 +++++------
 .../Currency_viewFieldLibrary/my_title.xml    | 13 +++++------
 ...Site_getAuthenticatedMemberPersonValue.xml |  7 ++----
 .../ERP5Site_getCategoriesFullPath.xml        |  7 ++----
 ..._getModulePortalTypeSortedPropertyList.xml |  7 ++----
 .../ERP5Site_getSpreadsheetColumnNameList.xml |  8 +++----
 .../ERP5Site_importObjectFromOOo.xml          |  7 ++----
 .../ERP5Site_importObjectFromOOoActivity.xml  |  7 ++----
 .../ERP5Site_importObjectFromOOoFastInput.xml |  7 ++----
 .../ERP5Type_acquireSecurityFromCategory.xml  |  7 ++----
 .../portal_skins/erp5_base/Email_view.xml     |  9 +++-----
 .../erp5_base/Entity_getDefaultEmailAsURL.xml |  9 +++-----
 .../Entity_getDefaultTelephoneAsURL.xml       |  7 ++----
 .../Entity_getMobileTelephoneAsURL.xml        |  7 ++----
 .../erp5_base/Entity_viewFieldLibrary.xml     |  7 ++----
 .../listbox_int_index.xml                     |  4 ++--
 .../my_contact_listbox.xml                    | 12 +++++-----
 .../my_product_line_list.xml                  |  6 ++---
 .../Entity_viewFieldLibrary/my_title.xml      |  4 ++--
 .../erp5_base/GeographicAddress_view.xml      |  7 ++----
 .../GeographicAddress_view/my_title.xml       |  4 ++--
 .../erp5_base/Image_viewFullSizedImage.xml    |  7 ++----
 ...rganisationModule_viewOrganisationList.xml |  7 ++----
 .../listbox.xml                               | 20 ++++++++---------
 .../OrganisationModule_viewSearchDialog.xml   |  7 ++----
 .../erp5_base/Organisation_view.xml           |  7 ++----
 .../erp5_base/Organisation_view/listbox.xml   | 12 +++++-----
 .../my_default_telephone_text.xml             |  4 ++--
 .../Organisation_viewContactList.xml          |  7 ++----
 .../Organisation_viewCoordinateList.xml       |  7 ++----
 .../erp5_base/Organisation_viewDetails.xml    |  7 ++----
 .../Organisation_viewDetails/listbox.xml      |  2 +-
 .../Organisation_viewFieldLibrary.xml         |  7 ++----
 .../my_activity_code.xml                      |  4 ++--
 .../my_corporate_name.xml                     |  2 +-
 .../my_corporate_registration_code.xml        |  2 +-
 .../my_ean13_code.xml                         |  2 +-
 .../my_function.xml                           |  6 ++---
 .../my_geographic_incorporate_code.xml        |  2 +-
 .../my_group.xml                              |  8 +++----
 .../my_role_list.xml                          |  8 +++----
 .../Organisation_viewFieldLibrary/my_site.xml |  8 +++----
 .../my_social_code.xml                        |  4 ++--
 .../my_start_date.xml                         |  4 ++--
 .../my_title.xml                              |  4 ++--
 .../my_vat_code.xml                           |  4 ++--
 ...anisation_viewFinancialInformationList.xml |  7 ++----
 .../my_price_currency.xml                     |  7 ++----
 .../PersonModule_viewCareerLogAsHTML.xml      |  7 ++----
 .../erp5_base/PersonModule_viewPersonList.xml |  7 ++----
 .../PersonModule_viewPersonList/listbox.xml   | 22 +++++++++----------
 .../erp5_base/Person_afterClone.xml           |  7 ++----
 .../erp5_base/Person_generatePassword.xml     |  7 ++----
 .../erp5_base/Person_getPrimaryGroup.xml      |  7 ++----
 .../erp5_base/Person_resetPassword.xml        |  7 ++----
 .../Person_sendPasswordNotification.xml       |  7 ++----
 .../erp5_base/Person_shiftDefaultCareer.xml   |  7 ++----
 .../Person_updateUserSecurityGroup.xml        |  7 ++----
 .../Person_validatePasswordsMatch.xml         |  7 ++----
 .../erp5_base/Person_view/listbox.xml         |  2 +-
 .../Person_view/my_career_activity.xml        |  7 ++----
 .../Person_view/my_career_function.xml        |  7 ++----
 .../erp5_base/Person_view/my_career_role.xml  |  7 ++----
 .../Person_view/my_default_fax_text.xml       |  2 +-
 .../Person_view/my_default_telephone_text.xml |  2 +-
 .../Person_view/my_mobile_telephone_text.xml  |  4 ++--
 .../erp5_base/Person_viewAssignment.xml       | 11 ++++------
 .../Person_viewAssignment/my_reference.xml    |  7 ++----
 .../Person_viewAssignment/my_title.xml        |  2 +-
 .../password_confirm.xml                      |  7 ++----
 .../erp5_base/Person_viewDetails.xml          | 11 ++++------
 .../erp5_base/Person_viewDetails/listbox.xml  | 16 +++++++-------
 .../erp5_base/Person_viewDetails/my_title.xml |  2 +-
 .../erp5_base/Person_viewFieldLibrary.xml     |  7 ++----
 .../Person_viewFieldLibrary/my_birth_name.xml |  4 ++--
 .../my_child_count.xml                        |  4 ++--
 .../Person_viewFieldLibrary/my_first_name.xml |  7 ++----
 .../Person_viewFieldLibrary/my_gender.xml     |  4 ++--
 .../Person_viewFieldLibrary/my_last_name.xml  |  7 ++----
 .../my_marital_status.xml                     |  4 ++--
 .../my_middle_name.xml                        |  4 ++--
 .../my_partner_count.xml                      |  4 ++--
 .../Person_viewFieldLibrary/my_prefix.xml     |  4 ++--
 .../Person_viewFieldLibrary/my_reference.xml  |  4 ++--
 .../Person_viewFieldLibrary/my_start_date.xml |  4 ++--
 .../Person_viewFieldLibrary/my_suffix.xml     |  4 ++--
 .../Person_viewFieldLibrary/my_title.xml      | 11 ++++------
 .../Person_viewFinancialInformationList.xml   |  7 ++----
 .../erp5_base/Person_viewPhoneList.xml        |  7 ++----
 .../erp5_base/Person_zGetPersonCareerLog.xml  | 13 +++++------
 .../erp5_base/QueryModule_viewQueryList.xml   |  7 ++----
 .../portal_skins/erp5_base/Query_view.xml     |  7 ++----
 .../erp5_base/RoleDefinition_view.xml         |  7 ++----
 .../RoleDefinition_viewFieldLibrary.xml       |  7 ++----
 .../my_agent_title_list.xml                   | 12 +++++-----
 .../my_function.xml                           |  7 ++----
 .../my_group.xml                              |  7 ++----
 .../my_site.xml                               |  7 ++----
 .../portal_skins/erp5_base/Telephone_view.xml |  7 ++----
 .../erp5_base/Telephone_viewFieldLibrary.xml  |  7 ++----
 .../my_telephone_area.xml                     |  6 ++---
 .../my_telephone_country.xml                  |  6 ++---
 .../my_telephone_extension.xml                |  6 ++---
 .../my_telephone_number.xml                   |  6 ++---
 .../portal_skins/erp5_base/Url_view.xml       |  7 ++----
 .../erp5_base/Url_view/my_url_string.xml      |  6 ++---
 .../portal_skins/erp5_base/file_icon.gif.xml  |  7 ++----
 .../portal_skins/erp5_base/image_icon.gif.xml |  7 ++----
 .../openoffice-erp5-objects-template.sxc.xml  |  7 ++----
 .../erp5_base/person_icon.gif.xml             |  7 ++----
 bt5/erp5_base/bt/revision                     |  2 +-
 183 files changed, 500 insertions(+), 770 deletions(-)

diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Address_viewFieldLibrary.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Address_viewFieldLibrary.xml
index c6ab11689c..3bf3f70f3e 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Address_viewFieldLibrary.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Address_viewFieldLibrary.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_base/SkinTemplateItem/portal_skins/erp5_base/Address_viewFieldLibrary/my_city.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Address_viewFieldLibrary/my_city.xml
index e92057e743..e53dd364f2 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Address_viewFieldLibrary/my_city.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Address_viewFieldLibrary/my_city.xml
@@ -79,7 +79,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>description</string> </key>
+                    <key> <string>description</string> </key>
                     <value> <string>The city.</string> </value>
                 </item>
                 <item>
@@ -95,7 +95,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>City</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Address_viewFieldLibrary/my_region.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Address_viewFieldLibrary/my_region.xml
index 799dbab4a2..199c821147 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Address_viewFieldLibrary/my_region.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Address_viewFieldLibrary/my_region.xml
@@ -58,7 +58,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>description</string> </key>
+                    <key> <string>description</string> </key>
                     <value> <string></string> </value>
                 </item>
                 <item>
@@ -70,7 +70,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>
@@ -80,7 +80,7 @@
                     <value> <string></string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string></string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Address_viewFieldLibrary/my_street_address.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Address_viewFieldLibrary/my_street_address.xml
index 5755122724..2f5f67b6b8 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Address_viewFieldLibrary/my_street_address.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Address_viewFieldLibrary/my_street_address.xml
@@ -61,7 +61,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>description</string> </key>
+                    <key> <string>description</string> </key>
                     <value> <string></string> </value>
                 </item>
                 <item>
@@ -83,11 +83,11 @@
                     <value> <string></string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string></string> </value>
                 </item>
                 <item>
-                    <key>                 <string>width</string> </key>
+                    <key> <string>width</string> </key>
                     <value>
                       <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
                     </value>
@@ -100,7 +100,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>description</string> </key>
+                    <key> <string>description</string> </key>
                     <value> <string>The street address.\n
 \n
 This usually contains the street name, building number and apartment number (if any).</string> </value>
@@ -124,11 +124,11 @@ This usually contains the street name, building number and apartment number (if
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Street Address</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>width</string> </key>
+                    <key> <string>width</string> </key>
                     <value> <int>30</int> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Address_viewFieldLibrary/my_zip_code.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Address_viewFieldLibrary/my_zip_code.xml
index 52aab11b3c..ad7f5cad2d 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Address_viewFieldLibrary/my_zip_code.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Address_viewFieldLibrary/my_zip_code.xml
@@ -94,11 +94,11 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>description</string> </key>
+                    <key> <string>description</string> </key>
                     <value> <string>The postal code</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>display_width</string> </key>
+                    <key> <string>display_width</string> </key>
                     <value> <int>10</int> </value>
                 </item>
                 <item>
@@ -120,7 +120,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Postal Code</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/AgentPrivilege_view.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/AgentPrivilege_view.xml
index 62df010c27..eea426a2dd 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/AgentPrivilege_view.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/AgentPrivilege_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_base/SkinTemplateItem/portal_skins/erp5_base/Agent_view.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Agent_view.xml
index ae4d58b7fb..9749641631 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Agent_view.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Agent_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_base/SkinTemplateItem/portal_skins/erp5_base/Agent_viewFullSizedSignature.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Agent_viewFullSizedSignature.xml
index 8bcf8daf71..329ccf90fb 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Agent_viewFullSizedSignature.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Agent_viewFullSizedSignature.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_base/SkinTemplateItem/portal_skins/erp5_base/Agent_viewImportSignatureDialog.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Agent_viewImportSignatureDialog.xml
index b908040860..b2fa8ba316 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Agent_viewImportSignatureDialog.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Agent_viewImportSignatureDialog.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_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_view.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_view.xml
index 1a80f1d9b2..c8f38a74ba 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_view.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_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_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_viewFieldLibrary.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_viewFieldLibrary.xml
index 385b67ba68..28166c5ad4 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_viewFieldLibrary.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_viewFieldLibrary.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_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_viewFieldLibrary/my_activity.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_viewFieldLibrary/my_activity.xml
index 4467a8cb7a..18141bdf28 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_viewFieldLibrary/my_activity.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_viewFieldLibrary/my_activity.xml
@@ -58,7 +58,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>description</string> </key>
+                    <key> <string>description</string> </key>
                     <value> <string></string> </value>
                 </item>
                 <item>
@@ -70,7 +70,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>
@@ -80,7 +80,7 @@
                     <value> <string></string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string></string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_viewFieldLibrary/my_destination_project_title.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_viewFieldLibrary/my_destination_project_title.xml
index e79bbded97..611dcd5bc8 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_viewFieldLibrary/my_destination_project_title.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_viewFieldLibrary/my_destination_project_title.xml
@@ -81,7 +81,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>base_category</string> </key>
+                    <key> <string>base_category</string> </key>
                     <value> <string>destination_project</string> </value>
                 </item>
                 <item>
@@ -89,7 +89,7 @@
                     <value> <string>project</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>description</string> </key>
+                    <key> <string>description</string> </key>
                     <value> <string>The project for the assignment.</string> </value>
                 </item>
                 <item>
@@ -101,7 +101,7 @@
                     <value> <string>Base_viewFieldLibrary</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>portal_type</string> </key>
+                    <key> <string>portal_type</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -116,7 +116,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Project</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_viewFieldLibrary/my_destination_title.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_viewFieldLibrary/my_destination_title.xml
index 64a58021e6..25ff28be57 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_viewFieldLibrary/my_destination_title.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_viewFieldLibrary/my_destination_title.xml
@@ -81,11 +81,11 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>base_category</string> </key>
+                    <key> <string>base_category</string> </key>
                     <value> <string>destination</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>description</string> </key>
+                    <key> <string>description</string> </key>
                     <value> <string>The organisation where the person is affected.</string> </value>
                 </item>
                 <item>
@@ -97,7 +97,7 @@
                     <value> <string>Base_viewFieldLibrary</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>portal_type</string> </key>
+                    <key> <string>portal_type</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -112,7 +112,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Organisation</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_viewFieldLibrary/my_function.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_viewFieldLibrary/my_function.xml
index 1ff35697c8..b3dd06fc42 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_viewFieldLibrary/my_function.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_viewFieldLibrary/my_function.xml
@@ -58,7 +58,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>description</string> </key>
+                    <key> <string>description</string> </key>
                     <value> <string></string> </value>
                 </item>
                 <item>
@@ -70,7 +70,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>
@@ -80,7 +80,7 @@
                     <value> <string></string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string></string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_viewFieldLibrary/my_group.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_viewFieldLibrary/my_group.xml
index 46664745c6..6e44c39299 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_viewFieldLibrary/my_group.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_viewFieldLibrary/my_group.xml
@@ -58,7 +58,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>description</string> </key>
+                    <key> <string>description</string> </key>
                     <value> <string></string> </value>
                 </item>
                 <item>
@@ -70,7 +70,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>
@@ -80,7 +80,7 @@
                     <value> <string></string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string></string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_viewFieldLibrary/my_site.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_viewFieldLibrary/my_site.xml
index a59765729e..a8ceecf5cb 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_viewFieldLibrary/my_site.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_viewFieldLibrary/my_site.xml
@@ -58,7 +58,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>description</string> </key>
+                    <key> <string>description</string> </key>
                     <value> <string></string> </value>
                 </item>
                 <item>
@@ -70,7 +70,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>
@@ -80,7 +80,7 @@
                     <value> <string></string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string></string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_viewFieldLibrary/my_start_date.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_viewFieldLibrary/my_start_date.xml
index 5c2cdeac4d..f082e3f100 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_viewFieldLibrary/my_start_date.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_viewFieldLibrary/my_start_date.xml
@@ -79,7 +79,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>description</string> </key>
+                    <key> <string>description</string> </key>
                     <value> <string>The date the assignment start.</string> </value>
                 </item>
                 <item>
@@ -95,7 +95,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Assignment Start Date</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_viewFieldLibrary/my_stop_date.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_viewFieldLibrary/my_stop_date.xml
index 3fb265e0bf..fecfce2322 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_viewFieldLibrary/my_stop_date.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_viewFieldLibrary/my_stop_date.xml
@@ -79,7 +79,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>description</string> </key>
+                    <key> <string>description</string> </key>
                     <value> <string>The date the assignment ends.</string> </value>
                 </item>
                 <item>
@@ -95,7 +95,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Assignment Stop Date</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_viewFieldLibrary/my_title.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_viewFieldLibrary/my_title.xml
index 4f61c20872..8240ca4ff9 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_viewFieldLibrary/my_title.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_viewFieldLibrary/my_title.xml
@@ -79,7 +79,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>description</string> </key>
+                    <key> <string>description</string> </key>
                     <value> <string>Title of the assignment.</string> </value>
                 </item>
                 <item>
@@ -95,7 +95,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Title</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_getReference.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_getReference.xml
index 728dd899f2..ccbcb67fa7 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_getReference.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_getReference.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_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_view.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_view.xml
index 93c23c701b..fb18820afc 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_view.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_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_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_viewFieldLibrary.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_viewFieldLibrary.xml
index f1a5bdb37b..80f11a5ba8 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_viewFieldLibrary.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_viewFieldLibrary.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_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_viewFieldLibrary/listbox.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_viewFieldLibrary/listbox.xml
index 97e726df33..6cd485cc38 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_viewFieldLibrary/listbox.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_viewFieldLibrary/listbox.xml
@@ -87,7 +87,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>columns</string> </key>
+                    <key> <string>columns</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -118,7 +118,7 @@
                     <value> <string>Base_viewFieldLibrary</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>portal_types</string> </key>
+                    <key> <string>portal_types</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -129,7 +129,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>selection_name</string> </key>
+                    <key> <string>selection_name</string> </key>
                     <value> <string>agent_selection</string> </value>
                 </item>
                 <item>
@@ -137,7 +137,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Agents</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_viewFieldLibrary/my_bank_account_holder_name.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_viewFieldLibrary/my_bank_account_holder_name.xml
index 6bb5b8fad9..b5c048e911 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_viewFieldLibrary/my_bank_account_holder_name.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_viewFieldLibrary/my_bank_account_holder_name.xml
@@ -79,7 +79,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>description</string> </key>
+                    <key> <string>description</string> </key>
                     <value> <string>The name of the card holder.</string> </value>
                 </item>
                 <item>
@@ -95,7 +95,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Cardholder Name</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_viewFieldLibrary/my_bank_account_key.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_viewFieldLibrary/my_bank_account_key.xml
index 56931fbb40..cb064f05ce 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_viewFieldLibrary/my_bank_account_key.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_viewFieldLibrary/my_bank_account_key.xml
@@ -79,7 +79,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>description</string> </key>
+                    <key> <string>description</string> </key>
                     <value> <string>The security key for this bank account.</string> </value>
                 </item>
                 <item>
@@ -95,7 +95,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>IBAN Key</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_viewFieldLibrary/my_bank_account_number.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_viewFieldLibrary/my_bank_account_number.xml
index 0accff7ef6..4315231be5 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_viewFieldLibrary/my_bank_account_number.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_viewFieldLibrary/my_bank_account_number.xml
@@ -79,7 +79,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>description</string> </key>
+                    <key> <string>description</string> </key>
                     <value> <string>The number of the bank account.</string> </value>
                 </item>
                 <item>
@@ -95,7 +95,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Bank Account Number</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_viewFieldLibrary/my_bank_code.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_viewFieldLibrary/my_bank_code.xml
index c34f607e25..4c4a7248fd 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_viewFieldLibrary/my_bank_code.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_viewFieldLibrary/my_bank_code.xml
@@ -80,11 +80,11 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>description</string> </key>
+                    <key> <string>description</string> </key>
                     <value> <string>The code of the bank.</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>display_maxwidth</string> </key>
+                    <key> <string>display_maxwidth</string> </key>
                     <value> <int>5</int> </value>
                 </item>
                 <item>
@@ -100,7 +100,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Bank Code</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_viewFieldLibrary/my_bank_country_code.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_viewFieldLibrary/my_bank_country_code.xml
index d1f203e05e..700a236db1 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_viewFieldLibrary/my_bank_country_code.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_viewFieldLibrary/my_bank_country_code.xml
@@ -81,15 +81,15 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>description</string> </key>
+                    <key> <string>description</string> </key>
                     <value> <string>The country code of the bank.</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>display_maxwidth</string> </key>
+                    <key> <string>display_maxwidth</string> </key>
                     <value> <int>2</int> </value>
                 </item>
                 <item>
-                    <key>                 <string>display_width</string> </key>
+                    <key> <string>display_width</string> </key>
                     <value> <int>4</int> </value>
                 </item>
                 <item>
@@ -105,7 +105,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Bank Country Code</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_viewFieldLibrary/my_branch.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_viewFieldLibrary/my_branch.xml
index 89005f5022..8104dc0c10 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_viewFieldLibrary/my_branch.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_viewFieldLibrary/my_branch.xml
@@ -79,7 +79,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>display_maxwidth</string> </key>
+                    <key> <string>display_maxwidth</string> </key>
                     <value> <int>5</int> </value>
                 </item>
                 <item>
@@ -95,7 +95,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Branch</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_viewFieldLibrary/my_source_title.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_viewFieldLibrary/my_source_title.xml
index 75fe7ed17e..c52ecd328d 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_viewFieldLibrary/my_source_title.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_viewFieldLibrary/my_source_title.xml
@@ -81,7 +81,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>base_category</string> </key>
+                    <key> <string>base_category</string> </key>
                     <value> <string>source</string> </value>
                 </item>
                 <item>
@@ -89,7 +89,7 @@
                     <value> <string>organisation</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>description</string> </key>
+                    <key> <string>description</string> </key>
                     <value> <string>The bank organisation in which this bank account was openned.</string> </value>
                 </item>
                 <item>
@@ -101,7 +101,7 @@
                     <value> <string>Base_viewFieldLibrary</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>portal_type</string> </key>
+                    <key> <string>portal_type</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -116,7 +116,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Bank</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_viewFieldLibrary/my_start_date.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_viewFieldLibrary/my_start_date.xml
index e29a4403e3..52e2b7f6c4 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_viewFieldLibrary/my_start_date.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_viewFieldLibrary/my_start_date.xml
@@ -79,7 +79,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>description</string> </key>
+                    <key> <string>description</string> </key>
                     <value> <string>Date when the bank account was open.</string> </value>
                 </item>
                 <item>
@@ -95,7 +95,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Opening Date</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_viewFieldLibrary/my_stop_date.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_viewFieldLibrary/my_stop_date.xml
index 95bedda84f..7f11e4c568 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_viewFieldLibrary/my_stop_date.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_viewFieldLibrary/my_stop_date.xml
@@ -79,7 +79,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>description</string> </key>
+                    <key> <string>description</string> </key>
                     <value> <string>Date when the bank account was closed.</string> </value>
                 </item>
                 <item>
@@ -95,7 +95,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Closing Date</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_viewFieldLibrary/my_title.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_viewFieldLibrary/my_title.xml
index 37c16c6b6d..07f01dcc5c 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_viewFieldLibrary/my_title.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_viewFieldLibrary/my_title.xml
@@ -81,15 +81,15 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>description</string> </key>
+                    <key> <string>description</string> </key>
                     <value> <string>Title of the bank account.</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>display_width</string> </key>
+                    <key> <string>display_width</string> </key>
                     <value> <int>30</int> </value>
                 </item>
                 <item>
-                    <key>                 <string>editable</string> </key>
+                    <key> <string>editable</string> </key>
                     <value> <int>1</int> </value>
                 </item>
                 <item>
@@ -105,7 +105,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Title</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_changeId.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_changeId.xml
index 2c254c3c94..5d7c3ea0f6 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_changeId.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_changeId.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_base/SkinTemplateItem/portal_skins/erp5_base/Base_newQuery.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_newQuery.xml
index ec2fb133ee..f9ba602c20 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_newQuery.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_newQuery.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_base/SkinTemplateItem/portal_skins/erp5_base/Base_viewChangeIdDialog.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_viewChangeIdDialog.xml
index 9209b11695..aa490f9b03 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_viewChangeIdDialog.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_viewChangeIdDialog.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>
@@ -84,25 +81,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_id</string>
@@ -110,7 +107,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>right</string> </key>
+                    <key> <string>right</string> </key>
                     <value>
                       <list/>
                     </value>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_viewPostQueryDialog.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_viewPostQueryDialog.xml
index 53ad25d4a8..7d2c3d11b0 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_viewPostQueryDialog.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_viewPostQueryDialog.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_base/SkinTemplateItem/portal_skins/erp5_base/Base_viewSecurity.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_viewSecurity.xml
index f663c71df4..3a180158c1 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_viewSecurity.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_viewSecurity.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_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary.xml
index 42903399b9..b913b03cf9 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary.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_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary/my_activity.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary/my_activity.xml
index 141bdde3ec..3ac18fefcf 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary/my_activity.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary/my_activity.xml
@@ -58,7 +58,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>description</string> </key>
+                    <key> <string>description</string> </key>
                     <value> <string></string> </value>
                 </item>
                 <item>
@@ -70,7 +70,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>
@@ -80,7 +80,7 @@
                     <value> <string></string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string></string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary/my_collective_agreement_title.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary/my_collective_agreement_title.xml
index c9f3dace3e..35f9144fed 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary/my_collective_agreement_title.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary/my_collective_agreement_title.xml
@@ -79,7 +79,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>description</string> </key>
+                    <key> <string>description</string> </key>
                     <value> <string>The name of the collective agreement.</string> </value>
                 </item>
                 <item>
@@ -95,7 +95,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Collective Agreement</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary/my_function.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary/my_function.xml
index a49bc31806..85e607ff57 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary/my_function.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary/my_function.xml
@@ -59,13 +59,13 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>default</string> </key>
+                    <key> <string>default</string> </key>
                     <value>
                       <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>description</string> </key>
+                    <key> <string>description</string> </key>
                     <value> <string></string> </value>
                 </item>
                 <item>
@@ -77,7 +77,7 @@
                     <value> <string></string> </value>
                 </item>
                 <item>
-                    <key>                 <string>items</string> </key>
+                    <key> <string>items</string> </key>
                     <value>
                       <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
                     </value>
@@ -87,7 +87,7 @@
                     <value> <string></string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string></string> </value>
                 </item>
               </dictionary>
@@ -98,11 +98,11 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>default</string> </key>
+                    <key> <string>default</string> </key>
                     <value> <string></string> </value>
                 </item>
                 <item>
-                    <key>                 <string>description</string> </key>
+                    <key> <string>description</string> </key>
                     <value> <string>The function assigned to the person.</string> </value>
                 </item>
                 <item>
@@ -114,7 +114,7 @@
                     <value> <string>Base_viewFieldLibrary</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>items</string> </key>
+                    <key> <string>items</string> </key>
                     <value>
                       <list/>
                     </value>
@@ -124,7 +124,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Function</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary/my_grade.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary/my_grade.xml
index 337495bbe7..3f6cbd11be 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary/my_grade.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary/my_grade.xml
@@ -58,7 +58,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>description</string> </key>
+                    <key> <string>description</string> </key>
                     <value> <string></string> </value>
                 </item>
                 <item>
@@ -70,7 +70,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>
@@ -80,7 +80,7 @@
                     <value> <string></string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string></string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary/my_role.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary/my_role.xml
index b216914f5d..7eac8e3df2 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary/my_role.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary/my_role.xml
@@ -58,7 +58,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>description</string> </key>
+                    <key> <string>description</string> </key>
                     <value> <string></string> </value>
                 </item>
                 <item>
@@ -70,7 +70,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>
@@ -80,7 +80,7 @@
                     <value> <string></string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string></string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary/my_salary_level.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary/my_salary_level.xml
index 018d4d0b19..25211fd9bd 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary/my_salary_level.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary/my_salary_level.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>
@@ -75,7 +75,7 @@
                     <value> <string></string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string></string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary/my_skill_list.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary/my_skill_list.xml
index d497328324..fa472d01bd 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary/my_skill_list.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary/my_skill_list.xml
@@ -58,7 +58,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>description</string> </key>
+                    <key> <string>description</string> </key>
                     <value> <string></string> </value>
                 </item>
                 <item>
@@ -70,7 +70,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>
@@ -80,7 +80,7 @@
                     <value> <string></string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string></string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary/my_start_date.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary/my_start_date.xml
index dbed4b6917..10a9e7fb9d 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary/my_start_date.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary/my_start_date.xml
@@ -79,7 +79,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>description</string> </key>
+                    <key> <string>description</string> </key>
                     <value> <string>The date this career step starts.</string> </value>
                 </item>
                 <item>
@@ -95,7 +95,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Career Begin Date</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary/my_stop_date.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary/my_stop_date.xml
index 2e6d74587d..b3d7f727f4 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary/my_stop_date.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary/my_stop_date.xml
@@ -79,7 +79,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>description</string> </key>
+                    <key> <string>description</string> </key>
                     <value> <string>The date this career step ends.</string> </value>
                 </item>
                 <item>
@@ -95,7 +95,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Career End Date</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary/my_subordination_title.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary/my_subordination_title.xml
index 83d60a6b3d..0178f11296 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary/my_subordination_title.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary/my_subordination_title.xml
@@ -82,15 +82,15 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>base_category</string> </key>
+                    <key> <string>base_category</string> </key>
                     <value> <string>subordination</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>catalog_index</string> </key>
+                    <key> <string>catalog_index</string> </key>
                     <value> <string>title</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>description</string> </key>
+                    <key> <string>description</string> </key>
                     <value> <string>The organisation for which the person works.</string> </value>
                 </item>
                 <item>
@@ -102,7 +102,7 @@
                     <value> <string>Base_viewFieldLibrary</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>portal_type</string> </key>
+                    <key> <string>portal_type</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -117,7 +117,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Organisation</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary/my_title.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary/my_title.xml
index 16a8b4efe1..9de3752d36 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary/my_title.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_viewFieldLibrary/my_title.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -85,7 +82,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>description</string> </key>
+                    <key> <string>description</string> </key>
                     <value> <string>The title of this career.</string> </value>
                 </item>
                 <item>
@@ -101,7 +98,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Career Title</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Coordinate_asURL.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Coordinate_asURL.xml
index 879f104f70..da75b6334c 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Coordinate_asURL.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Coordinate_asURL.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_base/SkinTemplateItem/portal_skins/erp5_base/Coordinate_viewFieldLibrary.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Coordinate_viewFieldLibrary.xml
index f47aed5577..2ad8e59ae9 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Coordinate_viewFieldLibrary.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Coordinate_viewFieldLibrary.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_base/SkinTemplateItem/portal_skins/erp5_base/Coordinate_viewFieldLibrary/my_int_index.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Coordinate_viewFieldLibrary/my_int_index.xml
index bb86c27ff5..8131170245 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Coordinate_viewFieldLibrary/my_int_index.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Coordinate_viewFieldLibrary/my_int_index.xml
@@ -64,7 +64,7 @@
                     <value> <string></string> </value>
                 </item>
                 <item>
-                    <key>                 <string>description</string> </key>
+                    <key> <string>description</string> </key>
                     <value> <string></string> </value>
                 </item>
                 <item>
@@ -84,7 +84,7 @@
                     <value> <string></string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string></string> </value>
                 </item>
               </dictionary>
@@ -95,7 +95,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>description</string> </key>
+                    <key> <string>description</string> </key>
                     <value> <string>Index used to sort coordinates</string> </value>
                 </item>
                 <item>
@@ -111,7 +111,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Index</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Coordinate_viewFieldLibrary/my_translated_id.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Coordinate_viewFieldLibrary/my_translated_id.xml
index 36ddc05b27..26967b0e51 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Coordinate_viewFieldLibrary/my_translated_id.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Coordinate_viewFieldLibrary/my_translated_id.xml
@@ -61,11 +61,11 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>description</string> </key>
+                    <key> <string>description</string> </key>
                     <value> <string></string> </value>
                 </item>
                 <item>
-                    <key>                 <string>editable</string> </key>
+                    <key> <string>editable</string> </key>
                     <value> <string></string> </value>
                 </item>
                 <item>
@@ -81,7 +81,7 @@
                     <value> <string></string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string></string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CreditCard_view.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CreditCard_view.xml
index 7c11c164ce..2b87f6e40c 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CreditCard_view.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CreditCard_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_base/SkinTemplateItem/portal_skins/erp5_base/CreditCard_view/my_bank_account_key.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CreditCard_view/my_bank_account_key.xml
index 2c4b59545b..405268d1ee 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CreditCard_view/my_bank_account_key.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CreditCard_view/my_bank_account_key.xml
@@ -79,7 +79,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>description</string> </key>
+                    <key> <string>description</string> </key>
                     <value> <string>The security key for the credit card.</string> </value>
                 </item>
                 <item>
@@ -95,7 +95,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Security Key</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CreditCard_view/my_bank_code.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CreditCard_view/my_bank_code.xml
index 65e41b0c77..ca31a608d1 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CreditCard_view/my_bank_code.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CreditCard_view/my_bank_code.xml
@@ -79,7 +79,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>description</string> </key>
+                    <key> <string>description</string> </key>
                     <value> <string>The type of credit card.</string> </value>
                 </item>
                 <item>
@@ -95,7 +95,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Credit Card Type</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CurrencyExchangeLine_asCellRange.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CurrencyExchangeLine_asCellRange.xml
index 3a8347122b..c15867f779 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CurrencyExchangeLine_asCellRange.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CurrencyExchangeLine_asCellRange.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_base/SkinTemplateItem/portal_skins/erp5_base/CurrencyExchangeLine_view/listbox.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CurrencyExchangeLine_view/listbox.xml
index b343e375eb..831024134e 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CurrencyExchangeLine_view/listbox.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CurrencyExchangeLine_view/listbox.xml
@@ -84,13 +84,13 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>all_editable_columns</string> </key>
+                    <key> <string>all_editable_columns</string> </key>
                     <value>
                       <list/>
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>columns</string> </key>
+                    <key> <string>columns</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -109,7 +109,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>editable_columns</string> </key>
+                    <key> <string>editable_columns</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -132,15 +132,15 @@
                     <value> <string>Base_viewFieldLibrary</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>lines</string> </key>
+                    <key> <string>lines</string> </key>
                     <value> <int>10</int> </value>
                 </item>
                 <item>
-                    <key>                 <string>list_action</string> </key>
+                    <key> <string>list_action</string> </key>
                     <value> <string>Folder_viewContentList</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>list_method</string> </key>
+                    <key> <string>list_method</string> </key>
                     <value>
                       <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
                     </value>
@@ -150,7 +150,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Currency Exchange Cells</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CurrencyExchangeLine_view/my_base_price.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CurrencyExchangeLine_view/my_base_price.xml
index 5e3b8e9424..39e4f0152c 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CurrencyExchangeLine_view/my_base_price.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CurrencyExchangeLine_view/my_base_price.xml
@@ -77,7 +77,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>description</string> </key>
+                    <key> <string>description</string> </key>
                     <value> <string>How much this currency is worth in terms of the reference currency.</string> </value>
                 </item>
                 <item>
@@ -89,7 +89,7 @@
                     <value> <string>Base_viewFieldLibrary</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>precision</string> </key>
+                    <key> <string>precision</string> </key>
                     <value> <int>6</int> </value>
                 </item>
                 <item>
@@ -97,7 +97,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Exchange Rate</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CurrencyExchangeLine_view/my_price_currency_title.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CurrencyExchangeLine_view/my_price_currency_title.xml
index 26cb8181bd..8e832a665f 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CurrencyExchangeLine_view/my_price_currency_title.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CurrencyExchangeLine_view/my_price_currency_title.xml
@@ -87,15 +87,15 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>allow_creation</string> </key>
+                    <key> <string>allow_creation</string> </key>
                     <value> <int>0</int> </value>
                 </item>
                 <item>
-                    <key>                 <string>allow_jump</string> </key>
+                    <key> <string>allow_jump</string> </key>
                     <value> <int>0</int> </value>
                 </item>
                 <item>
-                    <key>                 <string>base_category</string> </key>
+                    <key> <string>base_category</string> </key>
                     <value> <string>price_currency</string> </value>
                 </item>
                 <item>
@@ -103,7 +103,7 @@
                     <value> <string>currency</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>description</string> </key>
+                    <key> <string>description</string> </key>
                     <value> <string>The reference currency in which the exchange rate is given.</string> </value>
                 </item>
                 <item>
@@ -115,7 +115,7 @@
                     <value> <string>Base_viewFieldLibrary</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>items</string> </key>
+                    <key> <string>items</string> </key>
                     <value>
                       <list/>
                     </value>
@@ -125,7 +125,7 @@
                     <value> <int>0</int> </value>
                 </item>
                 <item>
-                    <key>                 <string>portal_type</string> </key>
+                    <key> <string>portal_type</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -140,7 +140,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 Currency</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CurrencyExchangeLine_view/my_source_title.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CurrencyExchangeLine_view/my_source_title.xml
index 5c17d9fcd1..3d914676a7 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CurrencyExchangeLine_view/my_source_title.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CurrencyExchangeLine_view/my_source_title.xml
@@ -80,7 +80,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>base_category</string> </key>
+                    <key> <string>base_category</string> </key>
                     <value> <string>source</string> </value>
                 </item>
                 <item>
@@ -92,7 +92,7 @@
                     <value> <string>Base_viewFieldLibrary</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>portal_type</string> </key>
+                    <key> <string>portal_type</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -107,7 +107,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Organisation</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CurrencyExchangeLine_view/my_title.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CurrencyExchangeLine_view/my_title.xml
index d5d40c785a..a945bcff21 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CurrencyExchangeLine_view/my_title.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CurrencyExchangeLine_view/my_title.xml
@@ -90,7 +90,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Title</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CurrencyModule_viewCurrencyList.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CurrencyModule_viewCurrencyList.xml
index 974b6da3cd..a84131f3a5 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CurrencyModule_viewCurrencyList.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CurrencyModule_viewCurrencyList.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_base/SkinTemplateItem/portal_skins/erp5_base/CurrencyModule_viewCurrencyList/listbox.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CurrencyModule_viewCurrencyList/listbox.xml
index baa6701ece..5c5c65824e 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CurrencyModule_viewCurrencyList/listbox.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CurrencyModule_viewCurrencyList/listbox.xml
@@ -84,7 +84,7 @@
                     <value> <int>1</int> </value>
                 </item>
                 <item>
-                    <key>                 <string>all_columns</string> </key>
+                    <key> <string>all_columns</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -129,7 +129,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>columns</string> </key>
+                    <key> <string>columns</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -164,7 +164,7 @@
                     <value> <string>Base_viewFieldLibrary</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>portal_types</string> </key>
+                    <key> <string>portal_types</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -175,11 +175,11 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>selection_name</string> </key>
+                    <key> <string>selection_name</string> </key>
                     <value> <string>currency_module_selection</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>sort</string> </key>
+                    <key> <string>sort</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -194,7 +194,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Currencies</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Currency_view/listbox.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Currency_view/listbox.xml
index 69b43f5e5e..aba851b9a2 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Currency_view/listbox.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Currency_view/listbox.xml
@@ -85,7 +85,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>columns</string> </key>
+                    <key> <string>columns</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -112,7 +112,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>default_params</string> </key>
+                    <key> <string>default_params</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -123,7 +123,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>editable_columns</string> </key>
+                    <key> <string>editable_columns</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -158,7 +158,7 @@
                     <value> <string>Base_viewFieldLibrary</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>selection_name</string> </key>
+                    <key> <string>selection_name</string> </key>
                     <value> <string>currency_exchange_line_selection</string> </value>
                 </item>
                 <item>
@@ -166,7 +166,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Currency Exchange Rates</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Currency_viewFieldLibrary.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Currency_viewFieldLibrary.xml
index 04e0107048..7fe4bf70be 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Currency_viewFieldLibrary.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Currency_viewFieldLibrary.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>my_currency_list</string>
@@ -106,7 +103,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>right</string> </key>
+                    <key> <string>right</string> </key>
                     <value>
                       <list/>
                     </value>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Currency_viewFieldLibrary/my_base_unit_quantity.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Currency_viewFieldLibrary/my_base_unit_quantity.xml
index 8bba6b5edb..c3881a1dde 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Currency_viewFieldLibrary/my_base_unit_quantity.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Currency_viewFieldLibrary/my_base_unit_quantity.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Currency_viewFieldLibrary/my_reference.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Currency_viewFieldLibrary/my_reference.xml
index 05812cd091..6edaea1798 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Currency_viewFieldLibrary/my_reference.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Currency_viewFieldLibrary/my_reference.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -87,11 +84,11 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>description</string> </key>
+                    <key> <string>description</string> </key>
                     <value> <string>ISO code of the currency or something similar</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>external_validator</string> </key>
+                    <key> <string>external_validator</string> </key>
                     <value>
                       <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
                     </value>
@@ -105,7 +102,7 @@
                     <value> <string>Base_viewFieldLibrary</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>required</string> </key>
+                    <key> <string>required</string> </key>
                     <value> <int>1</int> </value>
                 </item>
                 <item>
@@ -113,7 +110,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Currency Code</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Currency_viewFieldLibrary/my_short_title.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Currency_viewFieldLibrary/my_short_title.xml
index aed6e66568..50e1eefe50 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Currency_viewFieldLibrary/my_short_title.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Currency_viewFieldLibrary/my_short_title.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -85,7 +82,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>description</string> </key>
+                    <key> <string>description</string> </key>
                     <value> <string>The symbol used to represent the currency.\n
 \n
 It is for example $, \xc2\xa5, \xe2\x82\xac, \xc2\xa3...</string> </value>
@@ -103,7 +100,7 @@ It is for example $, \xc2\xa5, \xe2\x82\xac, \xc2\xa3...</string> </value>
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Currency Symbol</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Currency_viewFieldLibrary/my_start_date.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Currency_viewFieldLibrary/my_start_date.xml
index f623553481..691ac6cd8d 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Currency_viewFieldLibrary/my_start_date.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Currency_viewFieldLibrary/my_start_date.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -86,11 +83,11 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>date_only</string> </key>
+                    <key> <string>date_only</string> </key>
                     <value> <int>0</int> </value>
                 </item>
                 <item>
-                    <key>                 <string>description</string> </key>
+                    <key> <string>description</string> </key>
                     <value> <string>The beginning date for validity of the currency exchange rate.</string> </value>
                 </item>
                 <item>
@@ -106,7 +103,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Validity Start Date</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Currency_viewFieldLibrary/my_stop_date.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Currency_viewFieldLibrary/my_stop_date.xml
index 2398282457..4841aaac7e 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Currency_viewFieldLibrary/my_stop_date.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Currency_viewFieldLibrary/my_stop_date.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -86,11 +83,11 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>date_only</string> </key>
+                    <key> <string>date_only</string> </key>
                     <value> <int>0</int> </value>
                 </item>
                 <item>
-                    <key>                 <string>description</string> </key>
+                    <key> <string>description</string> </key>
                     <value> <string>The end date for validity of the currency exchange rate.</string> </value>
                 </item>
                 <item>
@@ -106,7 +103,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Validity End Date</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Currency_viewFieldLibrary/my_title.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Currency_viewFieldLibrary/my_title.xml
index 72678aef70..36ab8d70c9 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Currency_viewFieldLibrary/my_title.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Currency_viewFieldLibrary/my_title.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -86,7 +83,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>description</string> </key>
+                    <key> <string>description</string> </key>
                     <value> <string>Full, long name of the currency</string> </value>
                 </item>
                 <item>
@@ -98,7 +95,7 @@
                     <value> <string>Base_viewFieldLibrary</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>required</string> </key>
+                    <key> <string>required</string> </key>
                     <value> <int>1</int> </value>
                 </item>
                 <item>
@@ -106,7 +103,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Title</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/ERP5Site_getAuthenticatedMemberPersonValue.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/ERP5Site_getAuthenticatedMemberPersonValue.xml
index 1070f0d867..44afe67575 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/ERP5Site_getAuthenticatedMemberPersonValue.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/ERP5Site_getAuthenticatedMemberPersonValue.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_base/SkinTemplateItem/portal_skins/erp5_base/ERP5Site_getCategoriesFullPath.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/ERP5Site_getCategoriesFullPath.xml
index c959c9b155..2497b30d70 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/ERP5Site_getCategoriesFullPath.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/ERP5Site_getCategoriesFullPath.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_base/SkinTemplateItem/portal_skins/erp5_base/ERP5Site_getModulePortalTypeSortedPropertyList.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/ERP5Site_getModulePortalTypeSortedPropertyList.xml
index eb35543cba..efa2279b3c 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/ERP5Site_getModulePortalTypeSortedPropertyList.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/ERP5Site_getModulePortalTypeSortedPropertyList.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_base/SkinTemplateItem/portal_skins/erp5_base/ERP5Site_getSpreadsheetColumnNameList.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/ERP5Site_getSpreadsheetColumnNameList.xml
index 4d74ae09c1..d8e059c35c 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/ERP5Site_getSpreadsheetColumnNameList.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/ERP5Site_getSpreadsheetColumnNameList.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>
@@ -166,6 +163,7 @@ return listbox_lines\n
                             <string>column_name_list</string>
                             <string>column</string>
                             <string>safe_id</string>
+                            <string>_inplacevar_</string>
                             <string>int_len</string>
                             <string>o</string>
                           </tuple>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/ERP5Site_importObjectFromOOo.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/ERP5Site_importObjectFromOOo.xml
index aa950e7d5b..cdcd3875d9 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/ERP5Site_importObjectFromOOo.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/ERP5Site_importObjectFromOOo.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_base/SkinTemplateItem/portal_skins/erp5_base/ERP5Site_importObjectFromOOoActivity.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/ERP5Site_importObjectFromOOoActivity.xml
index 81ed249768..f88b351b75 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/ERP5Site_importObjectFromOOoActivity.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/ERP5Site_importObjectFromOOoActivity.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_base/SkinTemplateItem/portal_skins/erp5_base/ERP5Site_importObjectFromOOoFastInput.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/ERP5Site_importObjectFromOOoFastInput.xml
index 4006067522..9068f5d5f6 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/ERP5Site_importObjectFromOOoFastInput.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/ERP5Site_importObjectFromOOoFastInput.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_base/SkinTemplateItem/portal_skins/erp5_base/ERP5Type_acquireSecurityFromCategory.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/ERP5Type_acquireSecurityFromCategory.xml
index 95487c374d..d66accf785 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/ERP5Type_acquireSecurityFromCategory.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/ERP5Type_acquireSecurityFromCategory.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_base/SkinTemplateItem/portal_skins/erp5_base/Email_view.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Email_view.xml
index 1ca1ea197f..68fb223e08 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Email_view.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Email_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>
@@ -96,7 +93,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>right</string> </key>
+                    <key> <string>right</string> </key>
                     <value>
                       <list>
                         <string>my_url_string</string>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Entity_getDefaultEmailAsURL.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Entity_getDefaultEmailAsURL.xml
index db61e5dc8e..3d11977eee 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Entity_getDefaultEmailAsURL.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Entity_getDefaultEmailAsURL.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>
@@ -121,7 +118,7 @@ if email is not None:\n
                           <tuple>
                             <string>kw</string>
                             <string>_getattr_</string>
-<string>context</string>
+                            <string>context</string>
                             <string>email</string>
                             <string>None</string>
                           </tuple>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Entity_getDefaultTelephoneAsURL.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Entity_getDefaultTelephoneAsURL.xml
index 922cb2d578..d55a96f097 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Entity_getDefaultTelephoneAsURL.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Entity_getDefaultTelephoneAsURL.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_base/SkinTemplateItem/portal_skins/erp5_base/Entity_getMobileTelephoneAsURL.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Entity_getMobileTelephoneAsURL.xml
index 10eba9d721..c0f4a5d6ea 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Entity_getMobileTelephoneAsURL.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Entity_getMobileTelephoneAsURL.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_base/SkinTemplateItem/portal_skins/erp5_base/Entity_viewFieldLibrary.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Entity_viewFieldLibrary.xml
index ab34b597cd..3b1798d372 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Entity_viewFieldLibrary.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Entity_viewFieldLibrary.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_base/SkinTemplateItem/portal_skins/erp5_base/Entity_viewFieldLibrary/listbox_int_index.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Entity_viewFieldLibrary/listbox_int_index.xml
index ad79cb8bda..c415d8f4c4 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Entity_viewFieldLibrary/listbox_int_index.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Entity_viewFieldLibrary/listbox_int_index.xml
@@ -79,7 +79,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>description</string> </key>
+                    <key> <string>description</string> </key>
                     <value> <string>Index of a coordinate</string> </value>
                 </item>
                 <item>
@@ -95,7 +95,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Index</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Entity_viewFieldLibrary/my_contact_listbox.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Entity_viewFieldLibrary/my_contact_listbox.xml
index 3ebdd7822c..e0c67d1481 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Entity_viewFieldLibrary/my_contact_listbox.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Entity_viewFieldLibrary/my_contact_listbox.xml
@@ -83,7 +83,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>columns</string> </key>
+                    <key> <string>columns</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -110,7 +110,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>editable_columns</string> </key>
+                    <key> <string>editable_columns</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -133,7 +133,7 @@
                     <value> <string>Base_viewFieldLibrary</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>portal_types</string> </key>
+                    <key> <string>portal_types</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -168,7 +168,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>sort</string> </key>
+                    <key> <string>sort</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -187,11 +187,11 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Coordinates</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>url_columns</string> </key>
+                    <key> <string>url_columns</string> </key>
                     <value>
                       <list>
                         <tuple>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Entity_viewFieldLibrary/my_product_line_list.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Entity_viewFieldLibrary/my_product_line_list.xml
index d96d0c51a3..a3289278f0 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Entity_viewFieldLibrary/my_product_line_list.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Entity_viewFieldLibrary/my_product_line_list.xml
@@ -58,7 +58,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>description</string> </key>
+                    <key> <string>description</string> </key>
                     <value> <string></string> </value>
                 </item>
                 <item>
@@ -70,7 +70,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>
@@ -80,7 +80,7 @@
                     <value> <string></string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string></string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Entity_viewFieldLibrary/my_title.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Entity_viewFieldLibrary/my_title.xml
index fdd78cbec0..2d21815588 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Entity_viewFieldLibrary/my_title.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Entity_viewFieldLibrary/my_title.xml
@@ -79,7 +79,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>description</string> </key>
+                    <key> <string>description</string> </key>
                     <value> <string>Universal name of the entity.</string> </value>
                 </item>
                 <item>
@@ -95,7 +95,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Title</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/GeographicAddress_view.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/GeographicAddress_view.xml
index 9e1f16b4dc..75e93efd0f 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/GeographicAddress_view.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/GeographicAddress_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_base/SkinTemplateItem/portal_skins/erp5_base/GeographicAddress_view/my_title.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/GeographicAddress_view/my_title.xml
index deddec73db..13c75dd397 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/GeographicAddress_view/my_title.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/GeographicAddress_view/my_title.xml
@@ -85,7 +85,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>editable</string> </key>
+                    <key> <string>editable</string> </key>
                     <value> <int>1</int> </value>
                 </item>
                 <item>
@@ -101,7 +101,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Title</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Image_viewFullSizedImage.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Image_viewFullSizedImage.xml
index 1715632108..95380a0540 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Image_viewFullSizedImage.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Image_viewFullSizedImage.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_base/SkinTemplateItem/portal_skins/erp5_base/OrganisationModule_viewOrganisationList.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/OrganisationModule_viewOrganisationList.xml
index 775ebbbdb9..1b69a5c68e 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/OrganisationModule_viewOrganisationList.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/OrganisationModule_viewOrganisationList.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_base/SkinTemplateItem/portal_skins/erp5_base/OrganisationModule_viewOrganisationList/listbox.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/OrganisationModule_viewOrganisationList/listbox.xml
index b42610cd07..48b433f1ad 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/OrganisationModule_viewOrganisationList/listbox.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/OrganisationModule_viewOrganisationList/listbox.xml
@@ -91,7 +91,7 @@
                     <value> <int>1</int> </value>
                 </item>
                 <item>
-                    <key>                 <string>all_columns</string> </key>
+                    <key> <string>all_columns</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -180,7 +180,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>columns</string> </key>
+                    <key> <string>columns</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -215,7 +215,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>domain_root_list</string> </key>
+                    <key> <string>domain_root_list</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -242,7 +242,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>domain_tree</string> </key>
+                    <key> <string>domain_tree</string> </key>
                     <value> <int>1</int> </value>
                 </item>
                 <item>
@@ -262,7 +262,7 @@
                     <value> <string>ORGANISATION_LIST</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>portal_types</string> </key>
+                    <key> <string>portal_types</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -277,7 +277,7 @@
                     <value> <int>0</int> </value>
                 </item>
                 <item>
-                    <key>                 <string>search_columns</string> </key>
+                    <key> <string>search_columns</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -340,11 +340,11 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>selection_name</string> </key>
+                    <key> <string>selection_name</string> </key>
                     <value> <string>organisation_module_selection</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>sort</string> </key>
+                    <key> <string>sort</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -359,11 +359,11 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Organisations</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>url_columns</string> </key>
+                    <key> <string>url_columns</string> </key>
                     <value>
                       <list>
                         <tuple>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/OrganisationModule_viewSearchDialog.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/OrganisationModule_viewSearchDialog.xml
index 3cb623f1c2..71ca3c16bc 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/OrganisationModule_viewSearchDialog.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/OrganisationModule_viewSearchDialog.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_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_view.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_view.xml
index b41a33205e..1229f0d924 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_view.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_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_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_view/listbox.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_view/listbox.xml
index 658c066e3b..b8f682f0a7 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_view/listbox.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_view/listbox.xml
@@ -99,7 +99,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>columns</string> </key>
+                    <key> <string>columns</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -150,13 +150,13 @@
                     <value> <string>FOLDER_LIST</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>list_method</string> </key>
+                    <key> <string>list_method</string> </key>
                     <value>
                       <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>portal_types</string> </key>
+                    <key> <string>portal_types</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -171,7 +171,7 @@
                     <value> <int>0</int> </value>
                 </item>
                 <item>
-                    <key>                 <string>selection_name</string> </key>
+                    <key> <string>selection_name</string> </key>
                     <value> <string>organisation_view_selection</string> </value>
                 </item>
                 <item>
@@ -179,11 +179,11 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Persons</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>url_columns</string> </key>
+                    <key> <string>url_columns</string> </key>
                     <value>
                       <list>
                         <tuple>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_view/my_default_telephone_text.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_view/my_default_telephone_text.xml
index a186a7c06b..7cbb1f7bd1 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_view/my_default_telephone_text.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_view/my_default_telephone_text.xml
@@ -79,7 +79,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>description</string> </key>
+                    <key> <string>description</string> </key>
                     <value> <string>The telephone number.</string> </value>
                 </item>
                 <item>
@@ -95,7 +95,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Telephone</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewContactList.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewContactList.xml
index b2b28a2a66..6d8c7e4cb8 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewContactList.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewContactList.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_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewCoordinateList.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewCoordinateList.xml
index 5c292f9398..b2fbe1ce60 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewCoordinateList.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewCoordinateList.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_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewDetails.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewDetails.xml
index 30b640aff8..de5e713a5f 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewDetails.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewDetails.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_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewDetails/listbox.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewDetails/listbox.xml
index 717e519811..e74de6ba34 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewDetails/listbox.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewDetails/listbox.xml
@@ -92,7 +92,7 @@
                     <value> <string>Entity_viewFieldLibrary</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>selection_name</string> </key>
+                    <key> <string>selection_name</string> </key>
                     <value> <string>organisation_viewDetails_selection</string> </value>
                 </item>
                 <item>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary.xml
index de89f2ce64..3d7002d71e 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary.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_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_activity_code.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_activity_code.xml
index 5bc2cd0a21..3b1aee2314 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_activity_code.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_activity_code.xml
@@ -79,7 +79,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>description</string> </key>
+                    <key> <string>description</string> </key>
                     <value> <string>The activity code of the organisation.\n
 \n
 This code is specific to the local legislation. For instance, in France this is called "Code APE"</string> </value>
@@ -97,7 +97,7 @@ This code is specific to the local legislation. For instance, in France this is
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Activity Code</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_corporate_name.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_corporate_name.xml
index 36fb69a656..77e4adeb35 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_corporate_name.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_corporate_name.xml
@@ -90,7 +90,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Corporate Name</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_corporate_registration_code.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_corporate_registration_code.xml
index acaad9023c..79eb20088e 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_corporate_registration_code.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_corporate_registration_code.xml
@@ -90,7 +90,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Corporate Registration Code</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_ean13_code.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_ean13_code.xml
index b49b008e5d..195ab76c23 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_ean13_code.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_ean13_code.xml
@@ -90,7 +90,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>EAN 13 Code</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_function.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_function.xml
index 5a430abe9f..e3123bb0c4 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_function.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_function.xml
@@ -58,7 +58,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>description</string> </key>
+                    <key> <string>description</string> </key>
                     <value> <string></string> </value>
                 </item>
                 <item>
@@ -70,7 +70,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>
@@ -80,7 +80,7 @@
                     <value> <string></string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string></string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_geographic_incorporate_code.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_geographic_incorporate_code.xml
index 15f968fc48..4579b39f2e 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_geographic_incorporate_code.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_geographic_incorporate_code.xml
@@ -90,7 +90,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Geographic Incorporate Code</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_group.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_group.xml
index 32bc05cfef..69a28e9087 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_group.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_group.xml
@@ -58,7 +58,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>description</string> </key>
+                    <key> <string>description</string> </key>
                     <value> <string></string> </value>
                 </item>
                 <item>
@@ -70,7 +70,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>
@@ -80,7 +80,7 @@
                     <value> <string></string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string></string> </value>
                 </item>
               </dictionary>
@@ -103,7 +103,7 @@
                     <value> <string>Base_viewFieldLibrary</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>items</string> </key>
+                    <key> <string>items</string> </key>
                     <value>
                       <list/>
                     </value>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_role_list.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_role_list.xml
index 2a83f69b7c..be33ffcd51 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_role_list.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_role_list.xml
@@ -60,7 +60,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>description</string> </key>
+                    <key> <string>description</string> </key>
                     <value> <string></string> </value>
                 </item>
                 <item>
@@ -80,7 +80,7 @@
                     <value> <string></string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string></string> </value>
                 </item>
               </dictionary>
@@ -91,7 +91,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>description</string> </key>
+                    <key> <string>description</string> </key>
                     <value> <string>The roles of the organisation.</string> </value>
                 </item>
                 <item>
@@ -107,7 +107,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Role</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_site.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_site.xml
index 2df5e7e446..5b0163cceb 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_site.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_site.xml
@@ -58,7 +58,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>description</string> </key>
+                    <key> <string>description</string> </key>
                     <value> <string></string> </value>
                 </item>
                 <item>
@@ -70,7 +70,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>
@@ -80,7 +80,7 @@
                     <value> <string></string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string></string> </value>
                 </item>
               </dictionary>
@@ -103,7 +103,7 @@
                     <value> <string>Base_viewFieldLibrary</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>items</string> </key>
+                    <key> <string>items</string> </key>
                     <value>
                       <list/>
                     </value>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_social_code.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_social_code.xml
index 876074e286..32ff532dfe 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_social_code.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_social_code.xml
@@ -79,7 +79,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>description</string> </key>
+                    <key> <string>description</string> </key>
                     <value> <string>The organisation code for social security.</string> </value>
                 </item>
                 <item>
@@ -95,7 +95,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Social Code</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_start_date.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_start_date.xml
index 33bf838540..2b1cfdf320 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_start_date.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_start_date.xml
@@ -79,7 +79,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>description</string> </key>
+                    <key> <string>description</string> </key>
                     <value> <string>The date the organisation was registered.</string> </value>
                 </item>
                 <item>
@@ -95,7 +95,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Creation Date</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_title.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_title.xml
index d03401bb43..be48223631 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_title.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_title.xml
@@ -79,7 +79,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>description</string> </key>
+                    <key> <string>description</string> </key>
                     <value> <string>The usual name of the organisation.</string> </value>
                 </item>
                 <item>
@@ -95,7 +95,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Usual Name</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_vat_code.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_vat_code.xml
index 08340afde4..63930c4b10 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_vat_code.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFieldLibrary/my_vat_code.xml
@@ -79,7 +79,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>description</string> </key>
+                    <key> <string>description</string> </key>
                     <value> <string>The organisation code for Value Added Tax.</string> </value>
                 </item>
                 <item>
@@ -95,7 +95,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>VAT Code</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFinancialInformationList.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFinancialInformationList.xml
index 205d9243d4..19ec2cd4f1 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFinancialInformationList.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFinancialInformationList.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_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFinancialInformationList/my_price_currency.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFinancialInformationList/my_price_currency.xml
index 67ec0bab05..956bd03e56 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFinancialInformationList/my_price_currency.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_viewFinancialInformationList/my_price_currency.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PersonModule_viewCareerLogAsHTML.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PersonModule_viewCareerLogAsHTML.xml
index c4200b4a05..4fad656695 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PersonModule_viewCareerLogAsHTML.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PersonModule_viewCareerLogAsHTML.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_base/SkinTemplateItem/portal_skins/erp5_base/PersonModule_viewPersonList.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PersonModule_viewPersonList.xml
index d21b45b08b..bde2b7c6f5 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PersonModule_viewPersonList.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PersonModule_viewPersonList.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_base/SkinTemplateItem/portal_skins/erp5_base/PersonModule_viewPersonList/listbox.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PersonModule_viewPersonList/listbox.xml
index 9cf86dbd13..f8899379af 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PersonModule_viewPersonList/listbox.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PersonModule_viewPersonList/listbox.xml
@@ -89,7 +89,7 @@
                     <value> <int>1</int> </value>
                 </item>
                 <item>
-                    <key>                 <string>all_columns</string> </key>
+                    <key> <string>all_columns</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -202,7 +202,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>columns</string> </key>
+                    <key> <string>columns</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -241,7 +241,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>domain_root_list</string> </key>
+                    <key> <string>domain_root_list</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -272,7 +272,7 @@ Role & Region
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>domain_tree</string> </key>
+                    <key> <string>domain_tree</string> </key>
                     <value> <int>1</int> </value>
                 </item>
                 <item>
@@ -303,7 +303,7 @@ Role & Region
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>portal_types</string> </key>
+                    <key> <string>portal_types</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -318,7 +318,7 @@ Role & Region
                     <value> <int>0</int> </value>
                 </item>
                 <item>
-                    <key>                 <string>search_columns</string> </key>
+                    <key> <string>search_columns</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -425,11 +425,11 @@ Role & Region
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>selection_name</string> </key>
+                    <key> <string>selection_name</string> </key>
                     <value> <string>person_module_selection</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>sort</string> </key>
+                    <key> <string>sort</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -440,7 +440,7 @@ Role & Region
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>sort_columns</string> </key>
+                    <key> <string>sort_columns</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -551,11 +551,11 @@ Role & Region
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Persons</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>url_columns</string> </key>
+                    <key> <string>url_columns</string> </key>
                     <value>
                       <list>
                         <tuple>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_afterClone.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_afterClone.xml
index b9751f1858..a57719c5db 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_afterClone.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_afterClone.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_base/SkinTemplateItem/portal_skins/erp5_base/Person_generatePassword.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_generatePassword.xml
index 43615eae43..49177d1d49 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_generatePassword.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_generatePassword.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_base/SkinTemplateItem/portal_skins/erp5_base/Person_getPrimaryGroup.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_getPrimaryGroup.xml
index 82f8b5bbbd..7708baa782 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_getPrimaryGroup.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_getPrimaryGroup.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_base/SkinTemplateItem/portal_skins/erp5_base/Person_resetPassword.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_resetPassword.xml
index 7438f395ae..0f93ab530e 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_resetPassword.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_resetPassword.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_base/SkinTemplateItem/portal_skins/erp5_base/Person_sendPasswordNotification.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_sendPasswordNotification.xml
index e4d2047141..0fcf91f534 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_sendPasswordNotification.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_sendPasswordNotification.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_base/SkinTemplateItem/portal_skins/erp5_base/Person_shiftDefaultCareer.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_shiftDefaultCareer.xml
index e2cd637afc..646809146a 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_shiftDefaultCareer.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_shiftDefaultCareer.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_base/SkinTemplateItem/portal_skins/erp5_base/Person_updateUserSecurityGroup.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_updateUserSecurityGroup.xml
index f762eefa50..2390f9533e 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_updateUserSecurityGroup.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_updateUserSecurityGroup.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_base/SkinTemplateItem/portal_skins/erp5_base/Person_validatePasswordsMatch.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_validatePasswordsMatch.xml
index 10f1204858..d9acc77266 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_validatePasswordsMatch.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_validatePasswordsMatch.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_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/listbox.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/listbox.xml
index 5881760568..b6555c9225 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/listbox.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/listbox.xml
@@ -67,7 +67,7 @@
                     <value> <string></string> </value>
                 </item>
                 <item>
-                    <key>                 <string>selection_name</string> </key>
+                    <key> <string>selection_name</string> </key>
                     <value> <string></string> </value>
                 </item>
                 <item>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/my_career_activity.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/my_career_activity.xml
index c128d64bff..01f2457cd4 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/my_career_activity.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/my_career_activity.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/my_career_function.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/my_career_function.xml
index fbec26bccd..ed0c887a19 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/my_career_function.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/my_career_function.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/my_career_role.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/my_career_role.xml
index 51493c242a..a816664fa1 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/my_career_role.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/my_career_role.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/my_default_fax_text.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/my_default_fax_text.xml
index 2b8706a56a..e56cf15d46 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/my_default_fax_text.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/my_default_fax_text.xml
@@ -90,7 +90,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>FAX</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/my_default_telephone_text.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/my_default_telephone_text.xml
index cb0ea4a0e6..d3092b143c 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/my_default_telephone_text.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/my_default_telephone_text.xml
@@ -90,7 +90,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Telephone</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/my_mobile_telephone_text.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/my_mobile_telephone_text.xml
index d1a19925f9..c536c8da28 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/my_mobile_telephone_text.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_view/my_mobile_telephone_text.xml
@@ -79,7 +79,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>description</string> </key>
+                    <key> <string>description</string> </key>
                     <value> <string>The mobile telephone number.</string> </value>
                 </item>
                 <item>
@@ -95,7 +95,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Mobile Telephone</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewAssignment.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewAssignment.xml
index ac447f8d40..cc26af789e 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewAssignment.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewAssignment.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>
@@ -103,7 +100,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>left</string> </key>
+                    <key> <string>left</string> </key>
                     <value>
                       <list>
                         <string>my_title</string>
@@ -112,7 +109,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>right</string> </key>
+                    <key> <string>right</string> </key>
                     <value>
                       <list>
                         <string>my_password</string>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewAssignment/my_reference.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewAssignment/my_reference.xml
index 2655c47c53..31c87dc4fa 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewAssignment/my_reference.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewAssignment/my_reference.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewAssignment/my_title.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewAssignment/my_title.xml
index 6e26be96ba..69db2dc45f 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewAssignment/my_title.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewAssignment/my_title.xml
@@ -78,7 +78,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>editable</string> </key>
+                    <key> <string>editable</string> </key>
                     <value> <int>0</int> </value>
                 </item>
                 <item>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewAssignment/password_confirm.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewAssignment/password_confirm.xml
index 0d6f35536c..91963976ec 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewAssignment/password_confirm.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewAssignment/password_confirm.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewDetails.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewDetails.xml
index 66cbc289aa..93a88ad0c5 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewDetails.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewDetails.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>
@@ -80,7 +77,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>bottom</string> </key>
+                    <key> <string>bottom</string> </key>
                     <value>
                       <list>
                         <string>listbox</string>
@@ -94,7 +91,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>hidden</string> </key>
+                    <key> <string>hidden</string> </key>
                     <value>
                       <list>
                         <string>listbox_start_date</string>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewDetails/listbox.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewDetails/listbox.xml
index 8737f26538..0fa80665f5 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewDetails/listbox.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewDetails/listbox.xml
@@ -95,7 +95,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>columns</string> </key>
+                    <key> <string>columns</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -134,7 +134,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>editable_columns</string> </key>
+                    <key> <string>editable_columns</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -169,7 +169,7 @@
                     <value> <string>CONTACT_LIST</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>portal_types</string> </key>
+                    <key> <string>portal_types</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -184,7 +184,7 @@
                     <value> <int>0</int> </value>
                 </item>
                 <item>
-                    <key>                 <string>search_columns</string> </key>
+                    <key> <string>search_columns</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -223,11 +223,11 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>selection_name</string> </key>
+                    <key> <string>selection_name</string> </key>
                     <value> <string>person_viewCareer_selection</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>sort</string> </key>
+                    <key> <string>sort</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -238,7 +238,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>sort_columns</string> </key>
+                    <key> <string>sort_columns</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -281,7 +281,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Career Steps</string> </value>
                 </item>
                 <item>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewDetails/my_title.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewDetails/my_title.xml
index 6e26be96ba..69db2dc45f 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewDetails/my_title.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewDetails/my_title.xml
@@ -78,7 +78,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>editable</string> </key>
+                    <key> <string>editable</string> </key>
                     <value> <int>0</int> </value>
                 </item>
                 <item>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary.xml
index 200ef014af..e1c1e1c5c7 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary.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_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_birth_name.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_birth_name.xml
index f08c766ef2..038ad1717c 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_birth_name.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_birth_name.xml
@@ -79,7 +79,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>description</string> </key>
+                    <key> <string>description</string> </key>
                     <value> <string>The birth name, or maiden name of the person.</string> </value>
                 </item>
                 <item>
@@ -95,7 +95,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Birth Name</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_child_count.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_child_count.xml
index d62ddff455..c92bf0b8f9 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_child_count.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_child_count.xml
@@ -79,7 +79,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>description</string> </key>
+                    <key> <string>description</string> </key>
                     <value> <string>The number of children this person have.</string> </value>
                 </item>
                 <item>
@@ -95,7 +95,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Children</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_first_name.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_first_name.xml
index 42ced19925..08e8b56c8b 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_first_name.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_first_name.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_gender.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_gender.xml
index 24b22494b4..b3a88b420e 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_gender.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_gender.xml
@@ -57,7 +57,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>description</string> </key>
+                    <key> <string>description</string> </key>
                     <value> <string></string> </value>
                 </item>
                 <item>
@@ -73,7 +73,7 @@
                     <value> <string></string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string></string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_last_name.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_last_name.xml
index ac5512a8ed..ff55f3cd45 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_last_name.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_last_name.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_marital_status.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_marital_status.xml
index cb1ee6d44f..953c2eef44 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_marital_status.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_marital_status.xml
@@ -57,7 +57,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>description</string> </key>
+                    <key> <string>description</string> </key>
                     <value> <string></string> </value>
                 </item>
                 <item>
@@ -73,7 +73,7 @@
                     <value> <string></string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string></string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_middle_name.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_middle_name.xml
index d6b8793a28..a8b0167b29 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_middle_name.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_middle_name.xml
@@ -79,7 +79,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>description</string> </key>
+                    <key> <string>description</string> </key>
                     <value> <string>The middle name of the person.</string> </value>
                 </item>
                 <item>
@@ -95,7 +95,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Middle Name</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_partner_count.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_partner_count.xml
index 1f9b1ae52b..45e5b72fb6 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_partner_count.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_partner_count.xml
@@ -79,7 +79,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>description</string> </key>
+                    <key> <string>description</string> </key>
                     <value> <string>The number of partner for the person.</string> </value>
                 </item>
                 <item>
@@ -95,7 +95,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Partners</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_prefix.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_prefix.xml
index 9856bd358d..a477179ef5 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_prefix.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_prefix.xml
@@ -79,7 +79,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>description</string> </key>
+                    <key> <string>description</string> </key>
                     <value> <string>The prefix for the person\'s full name.\n
 \n
 Usually something like Dr. or Mr.</string> </value>
@@ -97,7 +97,7 @@ Usually something like Dr. or Mr.</string> </value>
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Prefix</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_reference.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_reference.xml
index af9db1b235..2909e7dc05 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_reference.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_reference.xml
@@ -79,7 +79,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>description</string> </key>
+                    <key> <string>description</string> </key>
                     <value> <string>The username this person will use to log in the system.\n
 \n
 The system will check that there isn\'t another user with the same username.</string> </value>
@@ -97,7 +97,7 @@ The system will check that there isn\'t another user with the same username.</st
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>User Login</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_start_date.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_start_date.xml
index 8b6fc0c9b8..664af26ccc 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_start_date.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_start_date.xml
@@ -79,7 +79,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>description</string> </key>
+                    <key> <string>description</string> </key>
                     <value> <string>The date of birth for the person.</string> </value>
                 </item>
                 <item>
@@ -95,7 +95,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Birthday</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_suffix.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_suffix.xml
index 494b04c5c3..bdaa7e1c4e 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_suffix.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_suffix.xml
@@ -79,7 +79,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>description</string> </key>
+                    <key> <string>description</string> </key>
                     <value> <string>The suffix for the person full name.\n
 \n
 Can be something like \'Jr.\'</string> </value>
@@ -97,7 +97,7 @@ Can be something like \'Jr.\'</string> </value>
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Suffix</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_title.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_title.xml
index 9258b6b07e..2dc5e4e43a 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_title.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFieldLibrary/my_title.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -85,7 +82,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>description</string> </key>
+                    <key> <string>description</string> </key>
                     <value> <string>The usual name of the person.</string> </value>
                 </item>
                 <item>
@@ -101,7 +98,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Usual Name</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFinancialInformationList.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFinancialInformationList.xml
index 99cedb5a1a..efaa93d4dd 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFinancialInformationList.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewFinancialInformationList.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_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPhoneList.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPhoneList.xml
index c4b9cde983..c37585a4a5 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPhoneList.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewPhoneList.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_base/SkinTemplateItem/portal_skins/erp5_base/Person_zGetPersonCareerLog.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_zGetPersonCareerLog.xml
index 731700c0f4..fa278d3e9b 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_zGetPersonCareerLog.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_zGetPersonCareerLog.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ZSQLMethods.SQL</string>
-          <string>SQL</string>
-        </tuple>
-        <none/>
+        <global name="SQL" module="Products.ZSQLMethods.SQL"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -107,9 +104,11 @@ ORDER BY Date</string> </value>
             <value>
               <object>
                 <klass>
-                  <global name="SQL" module="Shared.DC.ZRDB.DA"/>
+                  <global name="__newobj__" module="copy_reg"/>
                 </klass>
-                <none/>
+                <tuple>
+                  <global name="SQL" module="Shared.DC.ZRDB.DA"/>
+                </tuple>
                 <state>
                   <dictionary>
                     <item>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/QueryModule_viewQueryList.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/QueryModule_viewQueryList.xml
index 2d656105eb..06bb6c5104 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/QueryModule_viewQueryList.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/QueryModule_viewQueryList.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_base/SkinTemplateItem/portal_skins/erp5_base/Query_view.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Query_view.xml
index 59b388aedf..543dbf3332 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Query_view.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Query_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_base/SkinTemplateItem/portal_skins/erp5_base/RoleDefinition_view.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/RoleDefinition_view.xml
index 55aaad7220..7fbf9d4e7e 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/RoleDefinition_view.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/RoleDefinition_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_base/SkinTemplateItem/portal_skins/erp5_base/RoleDefinition_viewFieldLibrary.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/RoleDefinition_viewFieldLibrary.xml
index 3fbd4a48e5..a87845f400 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/RoleDefinition_viewFieldLibrary.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/RoleDefinition_viewFieldLibrary.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_base/SkinTemplateItem/portal_skins/erp5_base/RoleDefinition_viewFieldLibrary/my_agent_title_list.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/RoleDefinition_viewFieldLibrary/my_agent_title_list.xml
index e48d050b2d..d03de7efd3 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/RoleDefinition_viewFieldLibrary/my_agent_title_list.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/RoleDefinition_viewFieldLibrary/my_agent_title_list.xml
@@ -64,19 +64,19 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>allow_creation</string> </key>
+                    <key> <string>allow_creation</string> </key>
                     <value> <string></string> </value>
                 </item>
                 <item>
-                    <key>                 <string>base_category</string> </key>
+                    <key> <string>base_category</string> </key>
                     <value> <string></string> </value>
                 </item>
                 <item>
-                    <key>                 <string>catalog_index</string> </key>
+                    <key> <string>catalog_index</string> </key>
                     <value> <string></string> </value>
                 </item>
                 <item>
-                    <key>                 <string>description</string> </key>
+                    <key> <string>description</string> </key>
                     <value> <string></string> </value>
                 </item>
                 <item>
@@ -88,7 +88,7 @@
                     <value> <string></string> </value>
                 </item>
                 <item>
-                    <key>                 <string>portal_type</string> </key>
+                    <key> <string>portal_type</string> </key>
                     <value> <string></string> </value>
                 </item>
                 <item>
@@ -96,7 +96,7 @@
                     <value> <string></string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string></string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/RoleDefinition_viewFieldLibrary/my_function.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/RoleDefinition_viewFieldLibrary/my_function.xml
index f22059ae09..00565309b7 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/RoleDefinition_viewFieldLibrary/my_function.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/RoleDefinition_viewFieldLibrary/my_function.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_base/SkinTemplateItem/portal_skins/erp5_base/RoleDefinition_viewFieldLibrary/my_group.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/RoleDefinition_viewFieldLibrary/my_group.xml
index d7f6482cc9..234c0575f1 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/RoleDefinition_viewFieldLibrary/my_group.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/RoleDefinition_viewFieldLibrary/my_group.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_base/SkinTemplateItem/portal_skins/erp5_base/RoleDefinition_viewFieldLibrary/my_site.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/RoleDefinition_viewFieldLibrary/my_site.xml
index aec9cb75e7..86a5ab394a 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/RoleDefinition_viewFieldLibrary/my_site.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/RoleDefinition_viewFieldLibrary/my_site.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_base/SkinTemplateItem/portal_skins/erp5_base/Telephone_view.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Telephone_view.xml
index 6683f83430..428e086041 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Telephone_view.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Telephone_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_base/SkinTemplateItem/portal_skins/erp5_base/Telephone_viewFieldLibrary.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Telephone_viewFieldLibrary.xml
index 981456c430..2ab80768f4 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Telephone_viewFieldLibrary.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Telephone_viewFieldLibrary.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_base/SkinTemplateItem/portal_skins/erp5_base/Telephone_viewFieldLibrary/my_telephone_area.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Telephone_viewFieldLibrary/my_telephone_area.xml
index 91c9c3a8b2..83ade7220f 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Telephone_viewFieldLibrary/my_telephone_area.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Telephone_viewFieldLibrary/my_telephone_area.xml
@@ -80,11 +80,11 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>description</string> </key>
+                    <key> <string>description</string> </key>
                     <value> <string>The area</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>display_width</string> </key>
+                    <key> <string>display_width</string> </key>
                     <value> <int>5</int> </value>
                 </item>
                 <item>
@@ -100,7 +100,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Area</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Telephone_viewFieldLibrary/my_telephone_country.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Telephone_viewFieldLibrary/my_telephone_country.xml
index 7c40d2c04b..343160da39 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Telephone_viewFieldLibrary/my_telephone_country.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Telephone_viewFieldLibrary/my_telephone_country.xml
@@ -80,11 +80,11 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>description</string> </key>
+                    <key> <string>description</string> </key>
                     <value> <string>The country code</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>display_width</string> </key>
+                    <key> <string>display_width</string> </key>
                     <value> <int>5</int> </value>
                 </item>
                 <item>
@@ -100,7 +100,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Country</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Telephone_viewFieldLibrary/my_telephone_extension.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Telephone_viewFieldLibrary/my_telephone_extension.xml
index f9a0b9dc0d..0338f5fc6f 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Telephone_viewFieldLibrary/my_telephone_extension.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Telephone_viewFieldLibrary/my_telephone_extension.xml
@@ -80,11 +80,11 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>description</string> </key>
+                    <key> <string>description</string> </key>
                     <value> <string>The extension</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>display_width</string> </key>
+                    <key> <string>display_width</string> </key>
                     <value> <int>5</int> </value>
                 </item>
                 <item>
@@ -100,7 +100,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Extension</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Telephone_viewFieldLibrary/my_telephone_number.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Telephone_viewFieldLibrary/my_telephone_number.xml
index 69d350a4ba..8ca46d0611 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Telephone_viewFieldLibrary/my_telephone_number.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Telephone_viewFieldLibrary/my_telephone_number.xml
@@ -80,11 +80,11 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>description</string> </key>
+                    <key> <string>description</string> </key>
                     <value> <string>The phone number</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>display_width</string> </key>
+                    <key> <string>display_width</string> </key>
                     <value> <int>15</int> </value>
                 </item>
                 <item>
@@ -100,7 +100,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Number</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Url_view.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Url_view.xml
index 1a5197a44e..30111cbe1e 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Url_view.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Url_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_base/SkinTemplateItem/portal_skins/erp5_base/Url_view/my_url_string.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Url_view/my_url_string.xml
index 52058d9d46..53724dc5d8 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Url_view/my_url_string.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Url_view/my_url_string.xml
@@ -90,11 +90,11 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>default</string> </key>
+                    <key> <string>default</string> </key>
                     <value> <string></string> </value>
                 </item>
                 <item>
-                    <key>                 <string>description</string> </key>
+                    <key> <string>description</string> </key>
                     <value> <string>The URL</string> </value>
                 </item>
                 <item>
@@ -110,7 +110,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>URL</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/file_icon.gif.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/file_icon.gif.xml
index c5c61273da..fc9a5e45b9 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/file_icon.gif.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/file_icon.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_base/SkinTemplateItem/portal_skins/erp5_base/image_icon.gif.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/image_icon.gif.xml
index 1962d29da0..9499ee0bf3 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/image_icon.gif.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/image_icon.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_base/SkinTemplateItem/portal_skins/erp5_base/openoffice-erp5-objects-template.sxc.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/openoffice-erp5-objects-template.sxc.xml
index 66ce0301d7..e2a08dbe10 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/openoffice-erp5-objects-template.sxc.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/openoffice-erp5-objects-template.sxc.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_base/SkinTemplateItem/portal_skins/erp5_base/person_icon.gif.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/person_icon.gif.xml
index 2ec72a6e68..ec5c721bba 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/person_icon.gif.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/person_icon.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_base/bt/revision b/bt5/erp5_base/bt/revision
index 06690d5eea..34578cc4c5 100644
--- a/bt5/erp5_base/bt/revision
+++ b/bt5/erp5_base/bt/revision
@@ -1 +1 @@
-238
\ No newline at end of file
+239
\ No newline at end of file
-- 
2.30.9