From 696f07f995a49e6d8190ca131c07a62498f4213c Mon Sep 17 00:00:00 2001
From: Rafael Monnerat <rafael@nexedi.com>
Date: Mon, 21 Jul 2008 16:03:51 +0000
Subject: [PATCH] Update XML Format

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@22604 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
 .../Web%20Page%20Module/list_ui.xml           | 14 ++++---------
 .../Web%20Page%20Module/sort_on.xml           | 14 ++++---------
 .../portal_types/Web%20Page%20Module/view.xml | 14 ++++---------
 .../portal_types/Web%20Page/history.xml       | 14 ++++---------
 .../portal_types/Web%20Page/list.xml          | 14 ++++---------
 .../portal_types/Web%20Page/metadata.xml      | 14 ++++---------
 .../portal_types/Web%20Page/send_email.xml    | 14 ++++---------
 .../portal_types/Web%20Page/view.xml          | 21 ++++++-------------
 .../portal_types/Web%20Page/view_editor.xml   | 21 ++++++-------------
 .../portal_types/Web%20Page/web_view.xml      | 14 ++++---------
 .../Web%20Site%20Module/list_ui.xml           | 14 ++++---------
 .../Web%20Site%20Module/sort_on.xml           | 14 ++++---------
 .../portal_types/Web%20Site%20Module/view.xml | 14 ++++---------
 ...age_getStandardSubstitutionMappingDict.xml |  2 +-
 .../my_effective_date.xml                     |  4 ++--
 .../WebSection_zGetDocumentValueList.xml      | 10 ++++-----
 .../portal_skins/erp5_web_default_theme.xml   |  7 ++-----
 ...bSection_viewDefaultThemeConfiguration.xml | 10 ++++-----
 .../my_layout_body_background.xml             |  4 ++--
 .../my_layout_content_background.xml          |  4 ++--
 .../my_layout_content_border_color.xml        |  4 ++--
 .../my_layout_content_h1_color.xml            |  4 ++--
 .../my_layout_content_text_color.xml          |  4 ++--
 .../my_layout_footer_background.xml           |  4 ++--
 .../my_layout_footer_reference.xml            |  4 ++--
 .../my_layout_header_title_color.xml          |  4 ++--
 .../my_layout_highlight_reference.xml         |  4 ++--
 .../my_layout_logo_reference.xml              |  4 ++--
 .../my_layout_news_reference.xml              |  4 ++--
 .../my_layout_widget_background.xml           |  4 ++--
 .../my_layout_widget_border_color.xml         |  4 ++--
 .../my_layout_widget_legend_background.xml    |  4 ++--
 .../my_layout_widget_legend_color.xml         |  4 ++--
 .../erp5-website-background.png.xml           |  7 ++-----
 .../erp5-website-button.png.xml               |  7 ++-----
 .../erp5-website-external-link.png.xml        |  7 ++-----
 .../erp5-website-field.png.xml                |  7 ++-----
 .../erp5-website-logo.png.xml                 |  7 ++-----
 .../erp5-website-micro-gray-shadow.png.xml    |  7 ++-----
 .../erp5_web_admin_toolbox.css.xml            |  7 ++-----
 .../erp5_web_content_layout.xml               |  6 +++---
 .../erp5_web_layout.xml                       |  6 +++---
 .../erp5_web_section_layout.xml               |  6 +++---
 .../language_selector.xml                     |  7 ++-----
 .../erp5_web_default_theme/tabber.js.xml      |  7 ++-----
 .../tabber_style.css.xml                      |  7 ++-----
 .../portal_skins/erp5_web_widget_library.xml  |  7 ++-----
 .../Base_cloneContent.xml                     |  7 ++-----
 .../Base_newContent.xml                       |  7 ++-----
 .../Document_viewClassificationWidget.xml     |  7 ++-----
 .../Document_viewHistoryWidget.xml            |  7 ++-----
 .../Document_viewMembershipWidget.xml         |  7 ++-----
 .../Document_viewPopupTemplate.xml            |  7 ++-----
 .../Document_viewProfileWidget.xml            |  7 ++-----
 .../WebSite_calculateStatistics.xml           |  7 ++-----
 .../WebSite_getFancyRelativeDate.xml          |  7 ++-----
 .../WebSite_linkContent.xml                   |  7 ++-----
 .../WebSite_redirectToUserView.xml            |  7 ++-----
 .../admin_toolbox.png.xml                     |  7 ++-----
 .../admin_toolbox_clone_document.png.xml      |  7 ++-----
 .../admin_toolbox_new_document.png.xml        |  7 ++-----
 .../section_content_render.xml                |  7 ++-----
 .../erp5_web_widget_library/send_by_mail.xml  |  7 ++-----
 bt5/erp5_web/bt/revision                      |  2 +-
 64 files changed, 165 insertions(+), 333 deletions(-)

diff --git a/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Page%20Module/list_ui.xml b/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Page%20Module/list_ui.xml
index 7abbd98ba4..6a0388e679 100644
--- a/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Page%20Module/list_ui.xml
+++ b/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Page%20Module/list_ui.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Page%20Module/sort_on.xml b/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Page%20Module/sort_on.xml
index 4b00418f4b..ea0da7c66a 100644
--- a/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Page%20Module/sort_on.xml
+++ b/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Page%20Module/sort_on.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Page%20Module/view.xml b/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Page%20Module/view.xml
index d53fab9ed9..f982358a6d 100644
--- a/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Page%20Module/view.xml
+++ b/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Page%20Module/view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Page/history.xml b/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Page/history.xml
index 6f8def5339..a9b1015257 100644
--- a/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Page/history.xml
+++ b/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Page/history.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Page/list.xml b/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Page/list.xml
index 8b787d37be..570832a849 100644
--- a/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Page/list.xml
+++ b/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Page/list.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Page/metadata.xml b/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Page/metadata.xml
index 363291f6a0..531557f3c3 100644
--- a/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Page/metadata.xml
+++ b/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Page/metadata.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Page/send_email.xml b/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Page/send_email.xml
index 00a12a3ccf..2b6c6a54aa 100644
--- a/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Page/send_email.xml
+++ b/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Page/send_email.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Page/view.xml b/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Page/view.xml
index e8c4532501..159795c94b 100644
--- a/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Page/view.xml
+++ b/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Page/view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -72,11 +69,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -91,11 +85,8 @@
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Page/view_editor.xml b/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Page/view_editor.xml
index 8060877886..3f71bdfce6 100644
--- a/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Page/view_editor.xml
+++ b/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Page/view_editor.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -72,11 +69,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -91,11 +85,8 @@
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Page/web_view.xml b/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Page/web_view.xml
index 504ec8c5f9..8732380c3a 100644
--- a/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Page/web_view.xml
+++ b/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Page/web_view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Site%20Module/list_ui.xml b/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Site%20Module/list_ui.xml
index 76cb74af82..68e481ab45 100644
--- a/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Site%20Module/list_ui.xml
+++ b/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Site%20Module/list_ui.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Site%20Module/sort_on.xml b/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Site%20Module/sort_on.xml
index ebb480cfe2..fdf81defcb 100644
--- a/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Site%20Module/sort_on.xml
+++ b/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Site%20Module/sort_on.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Site%20Module/view.xml b/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Site%20Module/view.xml
index 91a4442266..aa72b526c2 100644
--- a/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Site%20Module/view.xml
+++ b/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Site%20Module/view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebPage_getStandardSubstitutionMappingDict.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebPage_getStandardSubstitutionMappingDict.xml
index 93e0c60ac2..a0c4f6fe47 100644
--- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebPage_getStandardSubstitutionMappingDict.xml
+++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebPage_getStandardSubstitutionMappingDict.xml
@@ -128,7 +128,7 @@ return dict(website_url=website.absolute_url(),\n
                         <value>
                           <tuple>
                             <string>_getattr_</string>
-<string>context</string>
+                            <string>context</string>
                             <string>website</string>
                             <string>websection</string>
                             <string>dict</string>
diff --git a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebPage_viewFieldLibrary/my_effective_date.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebPage_viewFieldLibrary/my_effective_date.xml
index 52dcdc834b..de085f7d63 100644
--- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebPage_viewFieldLibrary/my_effective_date.xml
+++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebPage_viewFieldLibrary/my_effective_date.xml
@@ -76,7 +76,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>description</string> </key>
+                    <key> <string>description</string> </key>
                     <value> <string>The date when a document is published.</string> </value>
                 </item>
                 <item>
@@ -92,7 +92,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Publication Date</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSection_zGetDocumentValueList.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSection_zGetDocumentValueList.xml
index 3c52aca282..189d1cf011 100644
--- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSection_zGetDocumentValueList.xml
+++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSection_zGetDocumentValueList.xml
@@ -79,11 +79,11 @@
                         <key> <string>_keys</string> </key>
                         <value>
                           <list>
-<string>language</string>
-<string>all_languages</string>
-<string>all_versions</string>
-<string>validation_state</string>
-<string>kw</string>
+                            <string>language</string>
+                            <string>all_languages</string>
+                            <string>all_versions</string>
+                            <string>validation_state</string>
+                            <string>kw</string>
                           </list>
                         </value>
                     </item>
diff --git a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme.xml
index 3928feffe5..df442a54a4 100644
--- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme.xml
+++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>OFS.Folder</string>
-          <string>Folder</string>
-        </tuple>
-        <none/>
+        <global name="Folder" module="OFS.Folder"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/WebSection_viewDefaultThemeConfiguration.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/WebSection_viewDefaultThemeConfiguration.xml
index dd928c5963..1cfc4313aa 100644
--- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/WebSection_viewDefaultThemeConfiguration.xml
+++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/WebSection_viewDefaultThemeConfiguration.xml
@@ -81,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 (Style)</string> </key>
+                    <key> <string>left (Style)</string> </key>
                     <value>
                       <list>
                         <string>my_layout_body_background</string>
@@ -117,7 +117,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>right (Widgets)</string> </key>
+                    <key> <string>right (Widgets)</string> </key>
                     <value>
                       <list>
                         <string>my_layout_footer_reference</string>
diff --git a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/WebSection_viewDefaultThemeConfiguration/my_layout_body_background.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/WebSection_viewDefaultThemeConfiguration/my_layout_body_background.xml
index bb62113643..204c874a87 100644
--- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/WebSection_viewDefaultThemeConfiguration/my_layout_body_background.xml
+++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/WebSection_viewDefaultThemeConfiguration/my_layout_body_background.xml
@@ -76,7 +76,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>display_width</string> </key>
+                    <key> <string>display_width</string> </key>
                     <value> <int>20</int> </value>
                 </item>
                 <item>
@@ -92,7 +92,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Body Background</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/WebSection_viewDefaultThemeConfiguration/my_layout_content_background.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/WebSection_viewDefaultThemeConfiguration/my_layout_content_background.xml
index a8c5d88829..82a6f3d1e7 100644
--- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/WebSection_viewDefaultThemeConfiguration/my_layout_content_background.xml
+++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/WebSection_viewDefaultThemeConfiguration/my_layout_content_background.xml
@@ -76,7 +76,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>display_width</string> </key>
+                    <key> <string>display_width</string> </key>
                     <value> <int>20</int> </value>
                 </item>
                 <item>
@@ -92,7 +92,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Content Background</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/WebSection_viewDefaultThemeConfiguration/my_layout_content_border_color.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/WebSection_viewDefaultThemeConfiguration/my_layout_content_border_color.xml
index c9125ec2ee..8aaded5e8b 100644
--- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/WebSection_viewDefaultThemeConfiguration/my_layout_content_border_color.xml
+++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/WebSection_viewDefaultThemeConfiguration/my_layout_content_border_color.xml
@@ -76,7 +76,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>display_width</string> </key>
+                    <key> <string>display_width</string> </key>
                     <value> <int>20</int> </value>
                 </item>
                 <item>
@@ -92,7 +92,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Content Border Color</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/WebSection_viewDefaultThemeConfiguration/my_layout_content_h1_color.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/WebSection_viewDefaultThemeConfiguration/my_layout_content_h1_color.xml
index 6d81367879..b39079dab8 100644
--- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/WebSection_viewDefaultThemeConfiguration/my_layout_content_h1_color.xml
+++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/WebSection_viewDefaultThemeConfiguration/my_layout_content_h1_color.xml
@@ -76,7 +76,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>display_width</string> </key>
+                    <key> <string>display_width</string> </key>
                     <value> <int>20</int> </value>
                 </item>
                 <item>
@@ -92,7 +92,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Content H1 Color</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/WebSection_viewDefaultThemeConfiguration/my_layout_content_text_color.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/WebSection_viewDefaultThemeConfiguration/my_layout_content_text_color.xml
index bcc3a493fa..c53e99f941 100644
--- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/WebSection_viewDefaultThemeConfiguration/my_layout_content_text_color.xml
+++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/WebSection_viewDefaultThemeConfiguration/my_layout_content_text_color.xml
@@ -76,7 +76,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>display_width</string> </key>
+                    <key> <string>display_width</string> </key>
                     <value> <int>20</int> </value>
                 </item>
                 <item>
@@ -92,7 +92,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Content Text Color</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/WebSection_viewDefaultThemeConfiguration/my_layout_footer_background.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/WebSection_viewDefaultThemeConfiguration/my_layout_footer_background.xml
index 37fd9c60e0..804ff16853 100644
--- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/WebSection_viewDefaultThemeConfiguration/my_layout_footer_background.xml
+++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/WebSection_viewDefaultThemeConfiguration/my_layout_footer_background.xml
@@ -76,7 +76,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>display_width</string> </key>
+                    <key> <string>display_width</string> </key>
                     <value> <int>20</int> </value>
                 </item>
                 <item>
@@ -92,7 +92,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Footer Background</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/WebSection_viewDefaultThemeConfiguration/my_layout_footer_reference.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/WebSection_viewDefaultThemeConfiguration/my_layout_footer_reference.xml
index 1fa78604d1..48ddb072bd 100644
--- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/WebSection_viewDefaultThemeConfiguration/my_layout_footer_reference.xml
+++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/WebSection_viewDefaultThemeConfiguration/my_layout_footer_reference.xml
@@ -76,7 +76,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>display_width</string> </key>
+                    <key> <string>display_width</string> </key>
                     <value> <int>20</int> </value>
                 </item>
                 <item>
@@ -92,7 +92,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Footer Reference</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/WebSection_viewDefaultThemeConfiguration/my_layout_header_title_color.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/WebSection_viewDefaultThemeConfiguration/my_layout_header_title_color.xml
index e8e4808005..1906908bc2 100644
--- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/WebSection_viewDefaultThemeConfiguration/my_layout_header_title_color.xml
+++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/WebSection_viewDefaultThemeConfiguration/my_layout_header_title_color.xml
@@ -76,7 +76,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>display_width</string> </key>
+                    <key> <string>display_width</string> </key>
                     <value> <int>20</int> </value>
                 </item>
                 <item>
@@ -92,7 +92,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Header Title Color</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/WebSection_viewDefaultThemeConfiguration/my_layout_highlight_reference.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/WebSection_viewDefaultThemeConfiguration/my_layout_highlight_reference.xml
index 8ae01d4747..194952b00c 100644
--- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/WebSection_viewDefaultThemeConfiguration/my_layout_highlight_reference.xml
+++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/WebSection_viewDefaultThemeConfiguration/my_layout_highlight_reference.xml
@@ -76,7 +76,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>display_width</string> </key>
+                    <key> <string>display_width</string> </key>
                     <value> <int>20</int> </value>
                 </item>
                 <item>
@@ -92,7 +92,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Highlight Reference</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/WebSection_viewDefaultThemeConfiguration/my_layout_logo_reference.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/WebSection_viewDefaultThemeConfiguration/my_layout_logo_reference.xml
index fab6169f86..10310b8df9 100644
--- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/WebSection_viewDefaultThemeConfiguration/my_layout_logo_reference.xml
+++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/WebSection_viewDefaultThemeConfiguration/my_layout_logo_reference.xml
@@ -76,7 +76,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>display_width</string> </key>
+                    <key> <string>display_width</string> </key>
                     <value> <int>20</int> </value>
                 </item>
                 <item>
@@ -92,7 +92,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Logo Reference</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/WebSection_viewDefaultThemeConfiguration/my_layout_news_reference.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/WebSection_viewDefaultThemeConfiguration/my_layout_news_reference.xml
index edbe675d6b..e129782146 100644
--- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/WebSection_viewDefaultThemeConfiguration/my_layout_news_reference.xml
+++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/WebSection_viewDefaultThemeConfiguration/my_layout_news_reference.xml
@@ -76,7 +76,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>display_width</string> </key>
+                    <key> <string>display_width</string> </key>
                     <value> <int>20</int> </value>
                 </item>
                 <item>
@@ -92,7 +92,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>News Reference</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/WebSection_viewDefaultThemeConfiguration/my_layout_widget_background.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/WebSection_viewDefaultThemeConfiguration/my_layout_widget_background.xml
index 48e4eb4774..7881ff14cb 100644
--- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/WebSection_viewDefaultThemeConfiguration/my_layout_widget_background.xml
+++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/WebSection_viewDefaultThemeConfiguration/my_layout_widget_background.xml
@@ -76,7 +76,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>display_width</string> </key>
+                    <key> <string>display_width</string> </key>
                     <value> <int>20</int> </value>
                 </item>
                 <item>
@@ -92,7 +92,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Widget Background</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/WebSection_viewDefaultThemeConfiguration/my_layout_widget_border_color.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/WebSection_viewDefaultThemeConfiguration/my_layout_widget_border_color.xml
index a3fc52ef48..2c42d4e840 100644
--- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/WebSection_viewDefaultThemeConfiguration/my_layout_widget_border_color.xml
+++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/WebSection_viewDefaultThemeConfiguration/my_layout_widget_border_color.xml
@@ -76,7 +76,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>display_width</string> </key>
+                    <key> <string>display_width</string> </key>
                     <value> <int>20</int> </value>
                 </item>
                 <item>
@@ -92,7 +92,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Widget Border Color</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/WebSection_viewDefaultThemeConfiguration/my_layout_widget_legend_background.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/WebSection_viewDefaultThemeConfiguration/my_layout_widget_legend_background.xml
index 21b436fb03..4c8b134f0f 100644
--- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/WebSection_viewDefaultThemeConfiguration/my_layout_widget_legend_background.xml
+++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/WebSection_viewDefaultThemeConfiguration/my_layout_widget_legend_background.xml
@@ -76,7 +76,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>display_width</string> </key>
+                    <key> <string>display_width</string> </key>
                     <value> <int>20</int> </value>
                 </item>
                 <item>
@@ -92,7 +92,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Widget Legend Background</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/WebSection_viewDefaultThemeConfiguration/my_layout_widget_legend_color.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/WebSection_viewDefaultThemeConfiguration/my_layout_widget_legend_color.xml
index d38c4c4c46..866b943117 100644
--- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/WebSection_viewDefaultThemeConfiguration/my_layout_widget_legend_color.xml
+++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/WebSection_viewDefaultThemeConfiguration/my_layout_widget_legend_color.xml
@@ -76,7 +76,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>display_width</string> </key>
+                    <key> <string>display_width</string> </key>
                     <value> <int>20</int> </value>
                 </item>
                 <item>
@@ -92,7 +92,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Widget Legend Color</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/erp5-website-background.png.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/erp5-website-background.png.xml
index a9e2ccf7f9..6adfed25b3 100644
--- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/erp5-website-background.png.xml
+++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/erp5-website-background.png.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>OFS.Image</string>
-          <string>Image</string>
-        </tuple>
-        <none/>
+        <global name="Image" module="OFS.Image"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/erp5-website-button.png.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/erp5-website-button.png.xml
index 1bbb600e0b..663ecc5519 100644
--- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/erp5-website-button.png.xml
+++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/erp5-website-button.png.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>OFS.Image</string>
-          <string>Image</string>
-        </tuple>
-        <none/>
+        <global name="Image" module="OFS.Image"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/erp5-website-external-link.png.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/erp5-website-external-link.png.xml
index 929e53bd12..c39a34a04b 100644
--- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/erp5-website-external-link.png.xml
+++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/erp5-website-external-link.png.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>OFS.Image</string>
-          <string>Image</string>
-        </tuple>
-        <none/>
+        <global name="Image" module="OFS.Image"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/erp5-website-field.png.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/erp5-website-field.png.xml
index ec28ef7fb7..1ecc256e53 100644
--- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/erp5-website-field.png.xml
+++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/erp5-website-field.png.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>OFS.Image</string>
-          <string>Image</string>
-        </tuple>
-        <none/>
+        <global name="Image" module="OFS.Image"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/erp5-website-logo.png.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/erp5-website-logo.png.xml
index fa80b05a8c..54adde4698 100644
--- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/erp5-website-logo.png.xml
+++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/erp5-website-logo.png.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>OFS.Image</string>
-          <string>Image</string>
-        </tuple>
-        <none/>
+        <global name="Image" module="OFS.Image"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/erp5-website-micro-gray-shadow.png.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/erp5-website-micro-gray-shadow.png.xml
index 4f35b78e33..29880ea154 100644
--- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/erp5-website-micro-gray-shadow.png.xml
+++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/erp5-website-micro-gray-shadow.png.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>OFS.Image</string>
-          <string>Image</string>
-        </tuple>
-        <none/>
+        <global name="Image" module="OFS.Image"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/erp5_web_admin_toolbox.css.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/erp5_web_admin_toolbox.css.xml
index df973fc369..4f0aa3ec37 100644
--- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/erp5_web_admin_toolbox.css.xml
+++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/erp5_web_admin_toolbox.css.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_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/erp5_web_content_layout.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/erp5_web_content_layout.xml
index 4ad643f92b..08e6f6fa37 100644
--- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/erp5_web_content_layout.xml
+++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/erp5_web_content_layout.xml
@@ -128,7 +128,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>left column (Sections)</string> </key>
+                    <key> <string>left column (Sections)</string> </key>
                     <value>
                       <list>
                         <string>subsection_list</string>
@@ -144,7 +144,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>right column (Highlight)</string> </key>
+                    <key> <string>right column (Highlight)</string> </key>
                     <value>
                       <list>
                         <string>website_highlight</string>
@@ -152,7 +152,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>right column (News)</string> </key>
+                    <key> <string>right column (News)</string> </key>
                     <value>
                       <list>
                         <string>website_news</string>
diff --git a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/erp5_web_layout.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/erp5_web_layout.xml
index fd2d1484af..18a1c3de6c 100644
--- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/erp5_web_layout.xml
+++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/erp5_web_layout.xml
@@ -128,7 +128,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>left column (Sections)</string> </key>
+                    <key> <string>left column (Sections)</string> </key>
                     <value>
                       <list>
                         <string>subsection_list</string>
@@ -144,7 +144,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>right column (Highlight)</string> </key>
+                    <key> <string>right column (Highlight)</string> </key>
                     <value>
                       <list>
                         <string>website_highlight</string>
@@ -152,7 +152,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>right column (News)</string> </key>
+                    <key> <string>right column (News)</string> </key>
                     <value>
                       <list>
                         <string>website_news</string>
diff --git a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/erp5_web_section_layout.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/erp5_web_section_layout.xml
index 661074802a..7f56492bdf 100644
--- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/erp5_web_section_layout.xml
+++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/erp5_web_section_layout.xml
@@ -128,7 +128,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>left column (Sections)</string> </key>
+                    <key> <string>left column (Sections)</string> </key>
                     <value>
                       <list>
                         <string>subsection_list</string>
@@ -144,7 +144,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>right column (Highlight)</string> </key>
+                    <key> <string>right column (Highlight)</string> </key>
                     <value>
                       <list>
                         <string>website_highlight</string>
@@ -152,7 +152,7 @@
                     </value>
                 </item>
                 <item>
-                    <key>                 <string>right column (News)</string> </key>
+                    <key> <string>right column (News)</string> </key>
                     <value>
                       <list>
                         <string>website_news</string>
diff --git a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/language_selector.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/language_selector.xml
index add8f1faf1..2c099aea5f 100644
--- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/language_selector.xml
+++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/language_selector.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_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/tabber.js.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/tabber.js.xml
index 51774448be..6012e2e124 100644
--- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/tabber.js.xml
+++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/tabber.js.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>OFS.DTMLDocument</string>
-          <string>DTMLDocument</string>
-        </tuple>
-        <none/>
+        <global name="DTMLDocument" module="OFS.DTMLDocument"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/tabber_style.css.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/tabber_style.css.xml
index d7d0e7ccd8..d3fdfaa7ff 100644
--- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/tabber_style.css.xml
+++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/tabber_style.css.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>OFS.DTMLDocument</string>
-          <string>DTMLDocument</string>
-        </tuple>
-        <none/>
+        <global name="DTMLDocument" module="OFS.DTMLDocument"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library.xml
index bfca4bf87e..7410085c63 100644
--- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library.xml
+++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>OFS.Folder</string>
-          <string>Folder</string>
-        </tuple>
-        <none/>
+        <global name="Folder" module="OFS.Folder"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/Base_cloneContent.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/Base_cloneContent.xml
index ab4c390529..804cf45024 100644
--- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/Base_cloneContent.xml
+++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/Base_cloneContent.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_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/Base_newContent.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/Base_newContent.xml
index 9608cb5f75..551b0caa2a 100644
--- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/Base_newContent.xml
+++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/Base_newContent.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_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/Document_viewClassificationWidget.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/Document_viewClassificationWidget.xml
index 151437930b..3178747b07 100644
--- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/Document_viewClassificationWidget.xml
+++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/Document_viewClassificationWidget.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_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/Document_viewHistoryWidget.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/Document_viewHistoryWidget.xml
index 6419529b44..79ff41c482 100644
--- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/Document_viewHistoryWidget.xml
+++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/Document_viewHistoryWidget.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_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/Document_viewMembershipWidget.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/Document_viewMembershipWidget.xml
index 756a2beda0..2c25593e41 100644
--- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/Document_viewMembershipWidget.xml
+++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/Document_viewMembershipWidget.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_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/Document_viewPopupTemplate.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/Document_viewPopupTemplate.xml
index d5739016d5..c1d41de125 100644
--- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/Document_viewPopupTemplate.xml
+++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/Document_viewPopupTemplate.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_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/Document_viewProfileWidget.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/Document_viewProfileWidget.xml
index 69f9d6061f..6690cea95c 100644
--- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/Document_viewProfileWidget.xml
+++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/Document_viewProfileWidget.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_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSite_calculateStatistics.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSite_calculateStatistics.xml
index 09a9545ed8..e90a104b87 100644
--- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSite_calculateStatistics.xml
+++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSite_calculateStatistics.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_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSite_getFancyRelativeDate.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSite_getFancyRelativeDate.xml
index b7cb86de75..1509d16979 100644
--- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSite_getFancyRelativeDate.xml
+++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSite_getFancyRelativeDate.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_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSite_linkContent.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSite_linkContent.xml
index 8859aa0cba..7f7a184fa5 100644
--- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSite_linkContent.xml
+++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSite_linkContent.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_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSite_redirectToUserView.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSite_redirectToUserView.xml
index da7f88ed88..b1c0eefd3c 100644
--- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSite_redirectToUserView.xml
+++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSite_redirectToUserView.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_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/admin_toolbox.png.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/admin_toolbox.png.xml
index ed8c40b57a..ebe08f805a 100644
--- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/admin_toolbox.png.xml
+++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/admin_toolbox.png.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>OFS.Image</string>
-          <string>Image</string>
-        </tuple>
-        <none/>
+        <global name="Image" module="OFS.Image"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/admin_toolbox_clone_document.png.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/admin_toolbox_clone_document.png.xml
index b15c97124c..bd66a43cdc 100644
--- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/admin_toolbox_clone_document.png.xml
+++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/admin_toolbox_clone_document.png.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>OFS.Image</string>
-          <string>Image</string>
-        </tuple>
-        <none/>
+        <global name="Image" module="OFS.Image"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/admin_toolbox_new_document.png.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/admin_toolbox_new_document.png.xml
index 1751c94849..66e19ee767 100644
--- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/admin_toolbox_new_document.png.xml
+++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/admin_toolbox_new_document.png.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>OFS.Image</string>
-          <string>Image</string>
-        </tuple>
-        <none/>
+        <global name="Image" module="OFS.Image"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/section_content_render.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/section_content_render.xml
index a3325e439b..4b8df1f6c0 100644
--- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/section_content_render.xml
+++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/section_content_render.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_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/send_by_mail.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/send_by_mail.xml
index 3f2f6d5eab..c0a173d7da 100644
--- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/send_by_mail.xml
+++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/send_by_mail.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_web/bt/revision b/bt5/erp5_web/bt/revision
index 6e1d38407b..01b67236d1 100644
--- a/bt5/erp5_web/bt/revision
+++ b/bt5/erp5_web/bt/revision
@@ -1 +1 @@
-687
\ No newline at end of file
+688
\ No newline at end of file
-- 
2.30.9