From 8955793677298b74dcda65d061c4349ba9dbf182 Mon Sep 17 00:00:00 2001
From: Fabien Morin <fabien@nexedi.com>
Date: Fri, 22 Oct 2010 11:39:02 +0000
Subject: [PATCH] bt format changes

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@39468 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
 .../portal_skins/erp5_web_blog.xml            |  5 +-
 .../erp5_web_blog/Blog_viewAsRSS.xml          |  5 +-
 .../erp5_web_blog/Blog_viewAsRSS/listbox.xml  | 10 +---
 .../erp5_web_blog/ListBox_viewAsBlog.xml      | 18 ++++---
 .../ListBox_viewAsCommentList.xml             | 15 +++---
 .../WebSection_getAuthorName.xml              |  5 +-
 .../WebSection_getBlogPostLink.xml            |  5 +-
 .../WebSection_getCategoryList.xml            |  5 +-
 .../WebSection_getNearbyPost.xml              |  5 +-
 .../erp5_web_blog/WebSection_getPostList.xml  |  5 +-
 .../WebSection_viewBlogFrontPage/listbox.xml  | 36 +++++++++----
 .../listbox_effective_date.xml                | 50 ++++---------------
 .../WebSection_viewBlogNavigator.xml          | 15 +++---
 .../WebSection_viewTagListWidget.xml          | 15 +++---
 .../portal_skins/erp5_web_blog/blog_css.xml   |  5 +-
 .../erp5_web_blog/blog_css/blog.css.xml       |  5 +-
 .../erp5_web_blog/blog_images.xml             |  5 +-
 .../blog_images/facebook-button.png.xml       |  5 +-
 .../blog_images/rss-image.png.xml             |  5 +-
 .../blog_images/twitter-button.png.xml        |  5 +-
 .../erp5_web_blog_demo_layout.xml             |  5 +-
 .../erp5_web_blog_demo_layout/tag_list.xml    | 10 +---
 .../erp5_web_blog/erp5_web_blog_layout.xml    |  5 +-
 .../erp5_web_blog_layout/admin_toolbox.xml    | 15 ++----
 .../applicable_layout.xml                     | 10 +---
 .../erp5_web_blog_layout/breadcrumb.xml       | 10 +---
 .../language_selector.xml                     | 10 +---
 .../erp5_web_blog_layout/search_action.xml    |  5 +-
 .../section_content_list.xml                  | 15 ++----
 .../erp5_web_blog_layout/tag_list.xml         |  5 +-
 .../erp5_web_blog_layout/website_footer.xml   | 10 +---
 .../website_highlight.xml                     | 15 ++----
 .../erp5_web_blog_layout/website_logo.xml     | 15 ++----
 .../erp5_web_blog_layout/website_news.xml     | 15 ++----
 .../erp5_web_blog_layout/your_search_text.xml | 10 +---
 .../erp5_web_blog_multiflex5_layout.xml       |  5 +-
 .../breadcrumb_box.xml                        |  5 +-
 .../footer_box.xml                            |  5 +-
 .../global_navigation_box.xml                 |  5 +-
 .../language_box.xml                          |  5 +-
 .../navigation_bar.xml                        |  5 +-
 .../news_box.xml                              |  5 +-
 .../page_title_box.xml                        |  5 +-
 .../relation_box.xml                          |  5 +-
 .../rss_box.xml                               |  5 +-
 .../search_bar.xml                            |  5 +-
 .../site_title_box.xml                        |  5 +-
 .../tag_list.xml                              |  5 +-
 .../toolbar.xml                               |  5 +-
 .../erp5_web_blog_section_layout.xml          |  5 +-
 .../admin_toolbox.xml                         |  5 +-
 .../applicable_layout.xml                     |  5 +-
 .../breadcrumb.xml                            |  5 +-
 .../language_selector.xml                     |  5 +-
 .../search_action.xml                         |  5 +-
 .../section_content_list.xml                  |  5 +-
 .../erp5_web_blog_section_layout/tag_list.xml |  5 +-
 .../website_footer.xml                        |  5 +-
 .../website_highlight.xml                     |  5 +-
 .../website_logo.xml                          |  5 +-
 .../website_news.xml                          |  5 +-
 .../your_search_text.xml                      |  5 +-
 bt5/erp5_web_blog/bt/comment                  |  8 +--
 bt5/erp5_web_blog/bt/revision                 |  2 +-
 64 files changed, 149 insertions(+), 375 deletions(-)

diff --git a/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog.xml b/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog.xml
index 5464cfa3e3..bfce916b9f 100644
--- a/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog.xml
+++ b/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="Folder" module="OFS.Folder"/>
-        <tuple/>
-      </tuple>
+      <global name="Folder" module="OFS.Folder"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/Blog_viewAsRSS.xml b/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/Blog_viewAsRSS.xml
index ff4188cbdd..71ff1ceb2c 100644
--- a/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/Blog_viewAsRSS.xml
+++ b/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/Blog_viewAsRSS.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5Form" module="Products.ERP5Form.Form"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/Blog_viewAsRSS/listbox.xml b/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/Blog_viewAsRSS/listbox.xml
index 8d2cc55f54..1cfdea1626 100644
--- a/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/Blog_viewAsRSS/listbox.xml
+++ b/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/Blog_viewAsRSS/listbox.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ListBox" module="Products.ERP5Form.ListBox"/>
-        <tuple/>
-      </tuple>
+      <global name="ListBox" module="Products.ERP5Form.ListBox"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -545,10 +542,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <tuple>
-        <global name="Method" module="Products.Formulator.MethodField"/>
-        <tuple/>
-      </tuple>
+      <global name="Method" module="Products.Formulator.MethodField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/ListBox_viewAsBlog.xml b/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/ListBox_viewAsBlog.xml
index c2726a7a2a..3a8cea5642 100644
--- a/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/ListBox_viewAsBlog.xml
+++ b/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/ListBox_viewAsBlog.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
-        <tuple/>
-      </tuple>
+      <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -37,7 +34,7 @@
         </item>
         <item>
             <key> <string>_text</string> </key>
-            <value> <string encoding="cdata"><![CDATA[
+            <value> <unicode encoding="cdata"><![CDATA[
 
 <div class="blog_rss"><a href="./Blog_viewAsRSS"><img src="blog_images/rss-image.png" alt="This blog as RSS" /></a></div>\n
 \n
@@ -90,9 +87,10 @@
 \n
     <tal:block tal:condition="not: repeat/line/end"><br /><hr class="post_separator" /></tal:block>\n
 \n
-</tal:block>
+</tal:block>\n
 
-]]></string> </value>
+
+]]></unicode> </value>
         </item>
         <item>
             <key> <string>content_type</string> </key>
@@ -106,9 +104,13 @@
             <key> <string>id</string> </key>
             <value> <string>ListBox_viewAsBlog</string> </value>
         </item>
+        <item>
+            <key> <string>output_encoding</string> </key>
+            <value> <string>utf-8</string> </value>
+        </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string></string> </value>
+            <value> <unicode></unicode> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/ListBox_viewAsCommentList.xml b/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/ListBox_viewAsCommentList.xml
index 9444ebba58..193a2bddfb 100644
--- a/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/ListBox_viewAsCommentList.xml
+++ b/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/ListBox_viewAsCommentList.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
-        <tuple/>
-      </tuple>
+      <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -37,7 +34,7 @@
         </item>
         <item>
             <key> <string>_text</string> </key>
-            <value> <string encoding="cdata"><![CDATA[
+            <value> <unicode encoding="cdata"><![CDATA[
 
        \n
 <h2><a name="comments" tal:content="python: len(here.query())">32</a> comments</h2>\n
@@ -59,7 +56,7 @@
 \n
 </tal:block>
 
-]]></string> </value>
+]]></unicode> </value>
         </item>
         <item>
             <key> <string>content_type</string> </key>
@@ -73,9 +70,13 @@
             <key> <string>id</string> </key>
             <value> <string>ListBox_viewAsCommentList</string> </value>
         </item>
+        <item>
+            <key> <string>output_encoding</string> </key>
+            <value> <string>utf-8</string> </value>
+        </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string></string> </value>
+            <value> <unicode></unicode> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/WebSection_getAuthorName.xml b/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/WebSection_getAuthorName.xml
index a3fd19d38e..df3cc5e660 100644
--- a/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/WebSection_getAuthorName.xml
+++ b/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/WebSection_getAuthorName.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
-        <tuple/>
-      </tuple>
+      <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/WebSection_getBlogPostLink.xml b/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/WebSection_getBlogPostLink.xml
index b232384569..1f49845217 100644
--- a/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/WebSection_getBlogPostLink.xml
+++ b/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/WebSection_getBlogPostLink.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
-        <tuple/>
-      </tuple>
+      <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/WebSection_getCategoryList.xml b/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/WebSection_getCategoryList.xml
index 0f23ac43ed..d66841faca 100644
--- a/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/WebSection_getCategoryList.xml
+++ b/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/WebSection_getCategoryList.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
-        <tuple/>
-      </tuple>
+      <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/WebSection_getNearbyPost.xml b/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/WebSection_getNearbyPost.xml
index f14decd785..113f852c13 100644
--- a/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/WebSection_getNearbyPost.xml
+++ b/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/WebSection_getNearbyPost.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
-        <tuple/>
-      </tuple>
+      <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/WebSection_getPostList.xml b/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/WebSection_getPostList.xml
index 4233963b8e..b2bb636093 100644
--- a/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/WebSection_getPostList.xml
+++ b/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/WebSection_getPostList.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
-        <tuple/>
-      </tuple>
+      <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/WebSection_viewBlogFrontPage/listbox.xml b/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/WebSection_viewBlogFrontPage/listbox.xml
index e32f904c32..6b6d3224ea 100644
--- a/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/WebSection_viewBlogFrontPage/listbox.xml
+++ b/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/WebSection_viewBlogFrontPage/listbox.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ListBox" module="Products.ERP5Form.ListBox"/>
-        <tuple/>
-      </tuple>
+      <global name="ListBox" module="Products.ERP5Form.ListBox"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -393,7 +390,11 @@
                 </item>
                 <item>
                     <key> <string>css_class</string> </key>
-                    <value> <string></string> </value>
+                    <value> <string>hidden_label</string> </value>
+                </item>
+                <item>
+                    <key> <string>default_display_style</string> </key>
+                    <value> <string>table</string> </value>
                 </item>
                 <item>
                     <key> <string>default_params</string> </key>
@@ -405,6 +406,12 @@
                     <key> <string>description</string> </key>
                     <value> <string></string> </value>
                 </item>
+                <item>
+                    <key> <string>display_style_list</string> </key>
+                    <value>
+                      <list/>
+                    </value>
+                </item>
                 <item>
                     <key> <string>domain_root_list</string> </key>
                     <value>
@@ -444,6 +451,10 @@
                       <list/>
                     </value>
                 </item>
+                <item>
+                    <key> <string>global_search_column</string> </key>
+                    <value> <string></string> </value>
+                </item>
                 <item>
                     <key> <string>hidden</string> </key>
                     <value> <int>0</int> </value>
@@ -472,6 +483,10 @@
                       <list/>
                     </value>
                 </item>
+                <item>
+                    <key> <string>page_navigation_mode</string> </key>
+                    <value> <string>slider</string> </value>
+                </item>
                 <item>
                     <key> <string>page_template</string> </key>
                     <value> <string>ListBox_viewAsBlog</string> </value>
@@ -536,6 +551,12 @@
                     <key> <string>stat_method</string> </key>
                     <value> <string></string> </value>
                 </item>
+                <item>
+                    <key> <string>style_columns</string> </key>
+                    <value>
+                      <list/>
+                    </value>
+                </item>
                 <item>
                     <key> <string>title</string> </key>
                     <value> <string>Blog posts</string> </value>
@@ -560,10 +581,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Method" module="Products.Formulator.MethodField"/>
-        <tuple/>
-      </tuple>
+      <global name="Method" module="Products.Formulator.MethodField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/WebSection_viewBlogFrontPage/listbox_effective_date.xml b/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/WebSection_viewBlogFrontPage/listbox_effective_date.xml
index 9b2d129ca2..cd01274ed9 100644
--- a/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/WebSection_viewBlogFrontPage/listbox_effective_date.xml
+++ b/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/WebSection_viewBlogFrontPage/listbox_effective_date.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="DateTimeField" module="Products.Formulator.StandardFields"/>
-        <tuple/>
-      </tuple>
+      <global name="DateTimeField" module="Products.Formulator.StandardFields"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -352,10 +349,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="BasicForm" module="Products.Formulator.Form"/>
-        <tuple/>
-      </tuple>
+      <global name="BasicForm" module="Products.Formulator.Form"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -489,10 +483,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <tuple>
-        <global name="TALESMethod" module="Products.Formulator.TALESField"/>
-        <tuple/>
-      </tuple>
+      <global name="TALESMethod" module="Products.Formulator.TALESField"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -505,10 +496,7 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <tuple>
-        <global name="StringField" module="Products.Formulator.StandardFields"/>
-        <tuple/>
-      </tuple>
+      <global name="StringField" module="Products.Formulator.StandardFields"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -765,10 +753,7 @@
   </record>
   <record id="5" aka="AAAAAAAAAAU=">
     <pickle>
-      <tuple>
-        <global name="IntegerField" module="Products.Formulator.StandardFields"/>
-        <tuple/>
-      </tuple>
+      <global name="IntegerField" module="Products.Formulator.StandardFields"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -1017,10 +1002,7 @@
   </record>
   <record id="6" aka="AAAAAAAAAAY=">
     <pickle>
-      <tuple>
-        <global name="IntegerField" module="Products.Formulator.StandardFields"/>
-        <tuple/>
-      </tuple>
+      <global name="IntegerField" module="Products.Formulator.StandardFields"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -1269,10 +1251,7 @@
   </record>
   <record id="7" aka="AAAAAAAAAAc=">
     <pickle>
-      <tuple>
-        <global name="IntegerField" module="Products.Formulator.StandardFields"/>
-        <tuple/>
-      </tuple>
+      <global name="IntegerField" module="Products.Formulator.StandardFields"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -1521,10 +1500,7 @@
   </record>
   <record id="8" aka="AAAAAAAAAAg=">
     <pickle>
-      <tuple>
-        <global name="IntegerField" module="Products.Formulator.StandardFields"/>
-        <tuple/>
-      </tuple>
+      <global name="IntegerField" module="Products.Formulator.StandardFields"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -1773,10 +1749,7 @@
   </record>
   <record id="9" aka="AAAAAAAAAAk=">
     <pickle>
-      <tuple>
-        <global name="ListField" module="Products.Formulator.StandardFields"/>
-        <tuple/>
-      </tuple>
+      <global name="ListField" module="Products.Formulator.StandardFields"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -2136,10 +2109,7 @@
   </record>
   <record id="10" aka="AAAAAAAAAAo=">
     <pickle>
-      <tuple>
-        <global name="IntegerField" module="Products.Formulator.StandardFields"/>
-        <tuple/>
-      </tuple>
+      <global name="IntegerField" module="Products.Formulator.StandardFields"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/WebSection_viewBlogNavigator.xml b/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/WebSection_viewBlogNavigator.xml
index b923ccf77b..f33d20cf17 100644
--- a/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/WebSection_viewBlogNavigator.xml
+++ b/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/WebSection_viewBlogNavigator.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
-        <tuple/>
-      </tuple>
+      <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -37,7 +34,7 @@
         </item>
         <item>
             <key> <string>_text</string> </key>
-            <value> <string encoding="cdata"><![CDATA[
+            <value> <unicode encoding="cdata"><![CDATA[
 
 <tal:block tal:define="nearby python: context.WebSection_getNearbyPost();\n
                        section python: context.getWebSectionValue().absolute_url() + \'/\';\n
@@ -52,7 +49,7 @@
 \n
 </tal:block>
 
-]]></string> </value>
+]]></unicode> </value>
         </item>
         <item>
             <key> <string>content_type</string> </key>
@@ -66,9 +63,13 @@
             <key> <string>id</string> </key>
             <value> <string>WebSection_viewBlogNavigator</string> </value>
         </item>
+        <item>
+            <key> <string>output_encoding</string> </key>
+            <value> <string>utf-8</string> </value>
+        </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string></string> </value>
+            <value> <unicode></unicode> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/WebSection_viewTagListWidget.xml b/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/WebSection_viewTagListWidget.xml
index 935d05d974..a10b3b39ee 100644
--- a/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/WebSection_viewTagListWidget.xml
+++ b/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/WebSection_viewTagListWidget.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
-        <tuple/>
-      </tuple>
+      <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -37,7 +34,7 @@
         </item>
         <item>
             <key> <string>_text</string> </key>
-            <value> <string encoding="cdata"><![CDATA[
+            <value> <unicode encoding="cdata"><![CDATA[
 
 <tal:block replace="nothing">\n
   <!--\n
@@ -54,7 +51,7 @@
 </ul>\n
 
 
-]]></string> </value>
+]]></unicode> </value>
         </item>
         <item>
             <key> <string>content_type</string> </key>
@@ -68,9 +65,13 @@
             <key> <string>id</string> </key>
             <value> <string>WebSection_viewTagListWidget</string> </value>
         </item>
+        <item>
+            <key> <string>output_encoding</string> </key>
+            <value> <string>utf-8</string> </value>
+        </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string></string> </value>
+            <value> <unicode></unicode> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/blog_css.xml b/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/blog_css.xml
index e5171954b8..5768fa571c 100644
--- a/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/blog_css.xml
+++ b/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/blog_css.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="Folder" module="OFS.Folder"/>
-        <tuple/>
-      </tuple>
+      <global name="Folder" module="OFS.Folder"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/blog_css/blog.css.xml b/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/blog_css/blog.css.xml
index 6f24a8acc7..f7bded1893 100644
--- a/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/blog_css/blog.css.xml
+++ b/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/blog_css/blog.css.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="File" module="OFS.Image"/>
-        <tuple/>
-      </tuple>
+      <global name="File" module="OFS.Image"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/blog_images.xml b/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/blog_images.xml
index 5ccf0f43f3..e6d683d64b 100644
--- a/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/blog_images.xml
+++ b/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/blog_images.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="Folder" module="OFS.Folder"/>
-        <tuple/>
-      </tuple>
+      <global name="Folder" module="OFS.Folder"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/blog_images/facebook-button.png.xml b/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/blog_images/facebook-button.png.xml
index 9c50134654..ec50595dca 100644
--- a/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/blog_images/facebook-button.png.xml
+++ b/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/blog_images/facebook-button.png.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="Image" module="OFS.Image"/>
-        <tuple/>
-      </tuple>
+      <global name="Image" module="OFS.Image"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/blog_images/rss-image.png.xml b/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/blog_images/rss-image.png.xml
index a6f2c9d24d..07838268f2 100644
--- a/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/blog_images/rss-image.png.xml
+++ b/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/blog_images/rss-image.png.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="Image" module="OFS.Image"/>
-        <tuple/>
-      </tuple>
+      <global name="Image" module="OFS.Image"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/blog_images/twitter-button.png.xml b/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/blog_images/twitter-button.png.xml
index b2b2bd488e..7cce7341cc 100644
--- a/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/blog_images/twitter-button.png.xml
+++ b/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/blog_images/twitter-button.png.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="Image" module="OFS.Image"/>
-        <tuple/>
-      </tuple>
+      <global name="Image" module="OFS.Image"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_demo_layout.xml b/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_demo_layout.xml
index 3f9e6fb7ed..182d3aa93a 100644
--- a/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_demo_layout.xml
+++ b/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_demo_layout.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5Form" module="Products.ERP5Form.Form"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_demo_layout/tag_list.xml b/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_demo_layout/tag_list.xml
index 189e3d5eb7..eae9bcae4f 100644
--- a/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_demo_layout/tag_list.xml
+++ b/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_demo_layout/tag_list.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ListBox" module="Products.ERP5Form.ListBox"/>
-        <tuple/>
-      </tuple>
+      <global name="ListBox" module="Products.ERP5Form.ListBox"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -531,10 +528,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Method" module="Products.Formulator.MethodField"/>
-        <tuple/>
-      </tuple>
+      <global name="Method" module="Products.Formulator.MethodField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_layout.xml b/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_layout.xml
index 3fde6ce240..f31bceaa38 100644
--- a/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_layout.xml
+++ b/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_layout.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5Form" module="Products.ERP5Form.Form"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_layout/admin_toolbox.xml b/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_layout/admin_toolbox.xml
index 4c80a535a4..8bd682bf21 100644
--- a/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_layout/admin_toolbox.xml
+++ b/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_layout/admin_toolbox.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -132,10 +129,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="TALESMethod" module="Products.Formulator.TALESField"/>
-        <tuple/>
-      </tuple>
+      <global name="TALESMethod" module="Products.Formulator.TALESField"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -148,10 +142,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <tuple>
-        <global name="TALESMethod" module="Products.Formulator.TALESField"/>
-        <tuple/>
-      </tuple>
+      <global name="TALESMethod" module="Products.Formulator.TALESField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_layout/applicable_layout.xml b/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_layout/applicable_layout.xml
index e0abc0aeff..ecbbc562f8 100644
--- a/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_layout/applicable_layout.xml
+++ b/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_layout/applicable_layout.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -120,10 +117,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="TALESMethod" module="Products.Formulator.TALESField"/>
-        <tuple/>
-      </tuple>
+      <global name="TALESMethod" module="Products.Formulator.TALESField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_layout/breadcrumb.xml b/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_layout/breadcrumb.xml
index bcae63c87d..bc8dbbc513 100644
--- a/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_layout/breadcrumb.xml
+++ b/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_layout/breadcrumb.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -125,10 +122,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="TALESMethod" module="Products.Formulator.TALESField"/>
-        <tuple/>
-      </tuple>
+      <global name="TALESMethod" module="Products.Formulator.TALESField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_layout/language_selector.xml b/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_layout/language_selector.xml
index 138d06947e..002cb87d97 100644
--- a/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_layout/language_selector.xml
+++ b/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_layout/language_selector.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -125,10 +122,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="TALESMethod" module="Products.Formulator.TALESField"/>
-        <tuple/>
-      </tuple>
+      <global name="TALESMethod" module="Products.Formulator.TALESField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_layout/search_action.xml b/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_layout/search_action.xml
index f0a8b009e9..774a5b50f8 100644
--- a/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_layout/search_action.xml
+++ b/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_layout/search_action.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="InputButtonField" module="Products.ERP5Form.InputButtonField"/>
-        <tuple/>
-      </tuple>
+      <global name="InputButtonField" module="Products.ERP5Form.InputButtonField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_layout/section_content_list.xml b/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_layout/section_content_list.xml
index 3d2549b5c5..ab4d9a9835 100644
--- a/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_layout/section_content_list.xml
+++ b/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_layout/section_content_list.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -132,10 +129,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="TALESMethod" module="Products.Formulator.TALESField"/>
-        <tuple/>
-      </tuple>
+      <global name="TALESMethod" module="Products.Formulator.TALESField"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -148,10 +142,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <tuple>
-        <global name="TALESMethod" module="Products.Formulator.TALESField"/>
-        <tuple/>
-      </tuple>
+      <global name="TALESMethod" module="Products.Formulator.TALESField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_layout/tag_list.xml b/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_layout/tag_list.xml
index ca46ad20a0..e60c24b9d4 100644
--- a/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_layout/tag_list.xml
+++ b/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_layout/tag_list.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_layout/website_footer.xml b/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_layout/website_footer.xml
index 561dda3494..222c987f2e 100644
--- a/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_layout/website_footer.xml
+++ b/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_layout/website_footer.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -125,10 +122,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="TALESMethod" module="Products.Formulator.TALESField"/>
-        <tuple/>
-      </tuple>
+      <global name="TALESMethod" module="Products.Formulator.TALESField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_layout/website_highlight.xml b/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_layout/website_highlight.xml
index a3482e2787..ed16a74e5d 100644
--- a/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_layout/website_highlight.xml
+++ b/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_layout/website_highlight.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -132,10 +129,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="TALESMethod" module="Products.Formulator.TALESField"/>
-        <tuple/>
-      </tuple>
+      <global name="TALESMethod" module="Products.Formulator.TALESField"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -148,10 +142,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <tuple>
-        <global name="TALESMethod" module="Products.Formulator.TALESField"/>
-        <tuple/>
-      </tuple>
+      <global name="TALESMethod" module="Products.Formulator.TALESField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_layout/website_logo.xml b/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_layout/website_logo.xml
index acd7c53a8f..90f71e4537 100644
--- a/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_layout/website_logo.xml
+++ b/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_layout/website_logo.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -132,10 +129,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="TALESMethod" module="Products.Formulator.TALESField"/>
-        <tuple/>
-      </tuple>
+      <global name="TALESMethod" module="Products.Formulator.TALESField"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -148,10 +142,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <tuple>
-        <global name="TALESMethod" module="Products.Formulator.TALESField"/>
-        <tuple/>
-      </tuple>
+      <global name="TALESMethod" module="Products.Formulator.TALESField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_layout/website_news.xml b/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_layout/website_news.xml
index cddcdb3fac..abbd6b2343 100644
--- a/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_layout/website_news.xml
+++ b/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_layout/website_news.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -132,10 +129,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="TALESMethod" module="Products.Formulator.TALESField"/>
-        <tuple/>
-      </tuple>
+      <global name="TALESMethod" module="Products.Formulator.TALESField"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -148,10 +142,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <tuple>
-        <global name="TALESMethod" module="Products.Formulator.TALESField"/>
-        <tuple/>
-      </tuple>
+      <global name="TALESMethod" module="Products.Formulator.TALESField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_layout/your_search_text.xml b/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_layout/your_search_text.xml
index 3699781d08..b60bc085cc 100644
--- a/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_layout/your_search_text.xml
+++ b/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_layout/your_search_text.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -115,10 +112,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="TALESMethod" module="Products.Formulator.TALESField"/>
-        <tuple/>
-      </tuple>
+      <global name="TALESMethod" module="Products.Formulator.TALESField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_multiflex5_layout.xml b/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_multiflex5_layout.xml
index a413b7cdab..1166e8ee54 100644
--- a/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_multiflex5_layout.xml
+++ b/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_multiflex5_layout.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5Form" module="Products.ERP5Form.Form"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_multiflex5_layout/breadcrumb_box.xml b/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_multiflex5_layout/breadcrumb_box.xml
index 3a3da40e04..9df025bdca 100644
--- a/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_multiflex5_layout/breadcrumb_box.xml
+++ b/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_multiflex5_layout/breadcrumb_box.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_multiflex5_layout/footer_box.xml b/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_multiflex5_layout/footer_box.xml
index 03b441c2fb..258c977bdc 100644
--- a/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_multiflex5_layout/footer_box.xml
+++ b/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_multiflex5_layout/footer_box.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_multiflex5_layout/global_navigation_box.xml b/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_multiflex5_layout/global_navigation_box.xml
index fdc12c2f32..79c592e1b9 100644
--- a/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_multiflex5_layout/global_navigation_box.xml
+++ b/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_multiflex5_layout/global_navigation_box.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_multiflex5_layout/language_box.xml b/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_multiflex5_layout/language_box.xml
index a87d7a855f..67f74125d8 100644
--- a/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_multiflex5_layout/language_box.xml
+++ b/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_multiflex5_layout/language_box.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_multiflex5_layout/navigation_bar.xml b/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_multiflex5_layout/navigation_bar.xml
index af073ca8a6..d09c1ddea6 100644
--- a/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_multiflex5_layout/navigation_bar.xml
+++ b/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_multiflex5_layout/navigation_bar.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_multiflex5_layout/news_box.xml b/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_multiflex5_layout/news_box.xml
index feb0ea58a1..d38c6612d5 100644
--- a/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_multiflex5_layout/news_box.xml
+++ b/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_multiflex5_layout/news_box.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_multiflex5_layout/page_title_box.xml b/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_multiflex5_layout/page_title_box.xml
index d412e6fcb8..bed5950e40 100644
--- a/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_multiflex5_layout/page_title_box.xml
+++ b/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_multiflex5_layout/page_title_box.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_multiflex5_layout/relation_box.xml b/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_multiflex5_layout/relation_box.xml
index 8f30b74d2f..398dcb45ee 100644
--- a/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_multiflex5_layout/relation_box.xml
+++ b/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_multiflex5_layout/relation_box.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_multiflex5_layout/rss_box.xml b/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_multiflex5_layout/rss_box.xml
index 1f2a01531b..b5565a3edf 100644
--- a/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_multiflex5_layout/rss_box.xml
+++ b/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_multiflex5_layout/rss_box.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_multiflex5_layout/search_bar.xml b/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_multiflex5_layout/search_bar.xml
index 8c8361b5a9..3886f8db9f 100644
--- a/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_multiflex5_layout/search_bar.xml
+++ b/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_multiflex5_layout/search_bar.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_multiflex5_layout/site_title_box.xml b/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_multiflex5_layout/site_title_box.xml
index 48bbed0508..6d77d993b6 100644
--- a/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_multiflex5_layout/site_title_box.xml
+++ b/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_multiflex5_layout/site_title_box.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_multiflex5_layout/tag_list.xml b/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_multiflex5_layout/tag_list.xml
index ca46ad20a0..e60c24b9d4 100644
--- a/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_multiflex5_layout/tag_list.xml
+++ b/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_multiflex5_layout/tag_list.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_multiflex5_layout/toolbar.xml b/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_multiflex5_layout/toolbar.xml
index 40255afd83..e3c074ad82 100644
--- a/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_multiflex5_layout/toolbar.xml
+++ b/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_multiflex5_layout/toolbar.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_section_layout.xml b/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_section_layout.xml
index b4b754e54a..488d1e5ffc 100644
--- a/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_section_layout.xml
+++ b/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_section_layout.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5Form" module="Products.ERP5Form.Form"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_section_layout/admin_toolbox.xml b/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_section_layout/admin_toolbox.xml
index 43b33b05cc..e24282a910 100644
--- a/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_section_layout/admin_toolbox.xml
+++ b/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_section_layout/admin_toolbox.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_section_layout/applicable_layout.xml b/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_section_layout/applicable_layout.xml
index 653cd1599c..84bba3f6cd 100644
--- a/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_section_layout/applicable_layout.xml
+++ b/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_section_layout/applicable_layout.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_section_layout/breadcrumb.xml b/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_section_layout/breadcrumb.xml
index 1aa4498a66..21d25a9c78 100644
--- a/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_section_layout/breadcrumb.xml
+++ b/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_section_layout/breadcrumb.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_section_layout/language_selector.xml b/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_section_layout/language_selector.xml
index f1c0f1a8ff..0dbbdc98cf 100644
--- a/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_section_layout/language_selector.xml
+++ b/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_section_layout/language_selector.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_section_layout/search_action.xml b/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_section_layout/search_action.xml
index 10534b7895..8c81985b27 100644
--- a/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_section_layout/search_action.xml
+++ b/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_section_layout/search_action.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_section_layout/section_content_list.xml b/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_section_layout/section_content_list.xml
index d0a2029ad3..8d8db0a091 100644
--- a/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_section_layout/section_content_list.xml
+++ b/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_section_layout/section_content_list.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_section_layout/tag_list.xml b/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_section_layout/tag_list.xml
index ca46ad20a0..e60c24b9d4 100644
--- a/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_section_layout/tag_list.xml
+++ b/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_section_layout/tag_list.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_section_layout/website_footer.xml b/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_section_layout/website_footer.xml
index 0e9a937a3b..f82f985061 100644
--- a/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_section_layout/website_footer.xml
+++ b/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_section_layout/website_footer.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_section_layout/website_highlight.xml b/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_section_layout/website_highlight.xml
index e1deadd71a..d82ac483c9 100644
--- a/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_section_layout/website_highlight.xml
+++ b/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_section_layout/website_highlight.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_section_layout/website_logo.xml b/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_section_layout/website_logo.xml
index 4f4cc9b219..1e33828aab 100644
--- a/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_section_layout/website_logo.xml
+++ b/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_section_layout/website_logo.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_section_layout/website_news.xml b/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_section_layout/website_news.xml
index 6392bc2883..fb860ec0b6 100644
--- a/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_section_layout/website_news.xml
+++ b/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_section_layout/website_news.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_section_layout/your_search_text.xml b/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_section_layout/your_search_text.xml
index dc958fb61b..167d77dab9 100644
--- a/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_section_layout/your_search_text.xml
+++ b/bt5/erp5_web_blog/SkinTemplateItem/portal_skins/erp5_web_blog/erp5_web_blog_section_layout/your_search_text.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
-        <tuple/>
-      </tuple>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_web_blog/bt/comment b/bt5/erp5_web_blog/bt/comment
index d000c40454..17790382bd 100644
--- a/bt5/erp5_web_blog/bt/comment
+++ b/bt5/erp5_web_blog/bt/comment
@@ -1,5 +1,5 @@
-Proof of concept version.
-TODO:
-- proxify all fields
-- provide working defaults for minimal theme and m54
+Proof of concept version.
+TODO:
+- proxify all fields
+- provide working defaults for minimal theme and m54
 Widget structure seems less appropriate from a modularity point of view than gadget structure.
\ No newline at end of file
diff --git a/bt5/erp5_web_blog/bt/revision b/bt5/erp5_web_blog/bt/revision
index aaa6442fe9..f70d7bba4a 100644
--- a/bt5/erp5_web_blog/bt/revision
+++ b/bt5/erp5_web_blog/bt/revision
@@ -1 +1 @@
-41
\ No newline at end of file
+42
\ No newline at end of file
-- 
2.30.9