From ad0d6da65c5c386d1f6070f69584d522b96eae73 Mon Sep 17 00:00:00 2001
From: Ivan Tyagov <ivan@nexedi.com>
Date: Tue, 28 Sep 2010 12:57:12 +0000
Subject: [PATCH] Small reorganization.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@38717 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
 .../Person_viewAsWeb.xml                          |  5 +----
 .../Person_viewAsWeb/assignment_listbox.xml       |  5 +----
 .../Person_viewAsWeb/career_listbox.xml           |  5 +----
 .../Person_viewAsWeb/latest_content_listbox.xml   | 10 ++--------
 .../my_career_subordination_title.xml             |  5 +----
 .../Person_viewAsWeb/my_default_address_city.xml  |  5 +----
 .../my_default_address_region.xml                 |  5 +----
 .../my_default_address_street_address.xml         |  5 +----
 .../my_default_address_zip_code.xml               |  5 +----
 .../Person_viewAsWeb/my_default_email_text.xml    |  5 +----
 .../Person_viewAsWeb/my_default_fax_text.xml      |  5 +----
 .../my_default_telephone_text.xml                 |  5 +----
 .../Person_viewAsWeb/my_description.xml           |  5 +----
 .../Person_viewAsWeb/my_first_name.xml            |  5 +----
 .../Person_viewAsWeb/my_gender.xml                |  5 +----
 .../Person_viewAsWeb/my_last_name.xml             |  5 +----
 .../Person_viewAsWeb/my_nationality.xml           |  5 +----
 .../my_translated_validation_state_title.xml      |  5 +----
 .../WebSection_viewAsWeb.xml                      |  5 +----
 .../empty_section_description.xml                 |  5 +----
 .../WebSection_viewAsWeb/my_description.xml       |  5 +----
 .../WebSite_loginForm.xml                         |  5 +----
 .../WebSite_loginForm/ac_login.xml                |  5 +----
 .../WebSite_loginForm/ac_password.xml             |  5 +----
 .../WebSite_loginForm/came_from.xml               | 10 ++--------
 .../WebSite_loginForm/login.xml                   |  5 +----
 .../WebSite_loginForm/login_message.xml           | 10 ++--------
 .../WebSite_viewLatestChangeList.xml              |  5 +----
 .../WebSite_viewLatestChangeList/listbox.xml      | 10 ++--------
 .../listbox_modification_date.xml                 |  5 +----
 .../listbox_thumbnail.xml                         |  5 +----
 .../WebSite_viewMyContentList.xml                 |  5 +----
 .../WebSite_viewMyContentList/listbox.xml         | 15 +++------------
 .../listbox_modification_date.xml                 | 10 ++--------
 .../listbox_thumbnail.xml                         |  5 +----
 .../WebSite_viewPendingEventList.xml              |  5 +----
 .../WebSite_viewPendingEventList/listbox.xml      | 15 +++------------
 .../listbox_modification_date.xml                 |  5 +----
 bt5/erp5_km/bt/revision                           |  2 +-
 39 files changed, 48 insertions(+), 189 deletions(-)
 rename bt5/erp5_km/SkinTemplateItem/portal_skins/{erp5_km => erp5_km_theme}/Person_viewAsWeb.xml (97%)
 rename bt5/erp5_km/SkinTemplateItem/portal_skins/{erp5_km => erp5_km_theme}/Person_viewAsWeb/assignment_listbox.xml (99%)
 rename bt5/erp5_km/SkinTemplateItem/portal_skins/{erp5_km => erp5_km_theme}/Person_viewAsWeb/career_listbox.xml (99%)
 rename bt5/erp5_km/SkinTemplateItem/portal_skins/{erp5_km => erp5_km_theme}/Person_viewAsWeb/latest_content_listbox.xml (98%)
 rename bt5/erp5_km/SkinTemplateItem/portal_skins/{erp5_km => erp5_km_theme}/Person_viewAsWeb/my_career_subordination_title.xml (99%)
 rename bt5/erp5_km/SkinTemplateItem/portal_skins/{erp5_km => erp5_km_theme}/Person_viewAsWeb/my_default_address_city.xml (98%)
 rename bt5/erp5_km/SkinTemplateItem/portal_skins/{erp5_km => erp5_km_theme}/Person_viewAsWeb/my_default_address_region.xml (98%)
 rename bt5/erp5_km/SkinTemplateItem/portal_skins/{erp5_km => erp5_km_theme}/Person_viewAsWeb/my_default_address_street_address.xml (98%)
 rename bt5/erp5_km/SkinTemplateItem/portal_skins/{erp5_km => erp5_km_theme}/Person_viewAsWeb/my_default_address_zip_code.xml (98%)
 rename bt5/erp5_km/SkinTemplateItem/portal_skins/{erp5_km => erp5_km_theme}/Person_viewAsWeb/my_default_email_text.xml (98%)
 rename bt5/erp5_km/SkinTemplateItem/portal_skins/{erp5_km => erp5_km_theme}/Person_viewAsWeb/my_default_fax_text.xml (98%)
 rename bt5/erp5_km/SkinTemplateItem/portal_skins/{erp5_km => erp5_km_theme}/Person_viewAsWeb/my_default_telephone_text.xml (98%)
 rename bt5/erp5_km/SkinTemplateItem/portal_skins/{erp5_km => erp5_km_theme}/Person_viewAsWeb/my_description.xml (98%)
 rename bt5/erp5_km/SkinTemplateItem/portal_skins/{erp5_km => erp5_km_theme}/Person_viewAsWeb/my_first_name.xml (98%)
 rename bt5/erp5_km/SkinTemplateItem/portal_skins/{erp5_km => erp5_km_theme}/Person_viewAsWeb/my_gender.xml (98%)
 rename bt5/erp5_km/SkinTemplateItem/portal_skins/{erp5_km => erp5_km_theme}/Person_viewAsWeb/my_last_name.xml (98%)
 rename bt5/erp5_km/SkinTemplateItem/portal_skins/{erp5_km => erp5_km_theme}/Person_viewAsWeb/my_nationality.xml (98%)
 rename bt5/erp5_km/SkinTemplateItem/portal_skins/{erp5_km => erp5_km_theme}/Person_viewAsWeb/my_translated_validation_state_title.xml (98%)
 rename bt5/erp5_km/SkinTemplateItem/portal_skins/{erp5_km => erp5_km_theme}/WebSection_viewAsWeb.xml (97%)
 rename bt5/erp5_km/SkinTemplateItem/portal_skins/{erp5_km => erp5_km_theme}/WebSection_viewAsWeb/empty_section_description.xml (99%)
 rename bt5/erp5_km/SkinTemplateItem/portal_skins/{erp5_km => erp5_km_theme}/WebSection_viewAsWeb/my_description.xml (98%)
 rename bt5/erp5_km/SkinTemplateItem/portal_skins/{erp5_km_widget_library => erp5_km_theme}/WebSite_loginForm.xml (97%)
 rename bt5/erp5_km/SkinTemplateItem/portal_skins/{erp5_km_widget_library => erp5_km_theme}/WebSite_loginForm/ac_login.xml (98%)
 rename bt5/erp5_km/SkinTemplateItem/portal_skins/{erp5_km_widget_library => erp5_km_theme}/WebSite_loginForm/ac_password.xml (98%)
 rename bt5/erp5_km/SkinTemplateItem/portal_skins/{erp5_km_widget_library => erp5_km_theme}/WebSite_loginForm/came_from.xml (97%)
 rename bt5/erp5_km/SkinTemplateItem/portal_skins/{erp5_km_widget_library => erp5_km_theme}/WebSite_loginForm/login.xml (98%)
 rename bt5/erp5_km/SkinTemplateItem/portal_skins/{erp5_km_widget_library => erp5_km_theme}/WebSite_loginForm/login_message.xml (97%)
 rename bt5/erp5_km/SkinTemplateItem/portal_skins/{erp5_km => erp5_km_theme}/WebSite_viewLatestChangeList.xml (97%)
 rename bt5/erp5_km/SkinTemplateItem/portal_skins/{erp5_km => erp5_km_theme}/WebSite_viewLatestChangeList/listbox.xml (94%)
 rename bt5/erp5_km/SkinTemplateItem/portal_skins/{erp5_km => erp5_km_theme}/WebSite_viewLatestChangeList/listbox_modification_date.xml (96%)
 rename bt5/erp5_km/SkinTemplateItem/portal_skins/{erp5_km => erp5_km_theme}/WebSite_viewLatestChangeList/listbox_thumbnail.xml (95%)
 rename bt5/erp5_km/SkinTemplateItem/portal_skins/{erp5_km => erp5_km_theme}/WebSite_viewMyContentList.xml (97%)
 rename bt5/erp5_km/SkinTemplateItem/portal_skins/{erp5_km => erp5_km_theme}/WebSite_viewMyContentList/listbox.xml (94%)
 rename bt5/erp5_km/SkinTemplateItem/portal_skins/{erp5_km => erp5_km_theme}/WebSite_viewMyContentList/listbox_modification_date.xml (93%)
 rename bt5/erp5_km/SkinTemplateItem/portal_skins/{erp5_km => erp5_km_theme}/WebSite_viewMyContentList/listbox_thumbnail.xml (95%)
 rename bt5/erp5_km/SkinTemplateItem/portal_skins/{erp5_km => erp5_km_theme}/WebSite_viewPendingEventList.xml (97%)
 rename bt5/erp5_km/SkinTemplateItem/portal_skins/{erp5_km => erp5_km_theme}/WebSite_viewPendingEventList/listbox.xml (98%)
 rename bt5/erp5_km/SkinTemplateItem/portal_skins/{erp5_km => erp5_km_theme}/WebSite_viewPendingEventList/listbox_modification_date.xml (99%)

diff --git a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km/Person_viewAsWeb.xml b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/Person_viewAsWeb.xml
similarity index 97%
rename from bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km/Person_viewAsWeb.xml
rename to bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/Person_viewAsWeb.xml
index 1e96850db4..8f7dbbb7fa 100644
--- a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km/Person_viewAsWeb.xml
+++ b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/Person_viewAsWeb.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_km/SkinTemplateItem/portal_skins/erp5_km/Person_viewAsWeb/assignment_listbox.xml b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/Person_viewAsWeb/assignment_listbox.xml
similarity index 99%
rename from bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km/Person_viewAsWeb/assignment_listbox.xml
rename to bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/Person_viewAsWeb/assignment_listbox.xml
index e2ac73e608..d8a6a9bcdd 100644
--- a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km/Person_viewAsWeb/assignment_listbox.xml
+++ b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/Person_viewAsWeb/assignment_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>
diff --git a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km/Person_viewAsWeb/career_listbox.xml b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/Person_viewAsWeb/career_listbox.xml
similarity index 99%
rename from bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km/Person_viewAsWeb/career_listbox.xml
rename to bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/Person_viewAsWeb/career_listbox.xml
index 8cbdbc814f..972d595035 100644
--- a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km/Person_viewAsWeb/career_listbox.xml
+++ b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/Person_viewAsWeb/career_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>
diff --git a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km/Person_viewAsWeb/latest_content_listbox.xml b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/Person_viewAsWeb/latest_content_listbox.xml
similarity index 98%
rename from bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km/Person_viewAsWeb/latest_content_listbox.xml
rename to bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/Person_viewAsWeb/latest_content_listbox.xml
index 48dce4aeb0..a1526ba8c6 100644
--- a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km/Person_viewAsWeb/latest_content_listbox.xml
+++ b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/Person_viewAsWeb/latest_content_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>
@@ -558,10 +555,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_km/SkinTemplateItem/portal_skins/erp5_km/Person_viewAsWeb/my_career_subordination_title.xml b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/Person_viewAsWeb/my_career_subordination_title.xml
similarity index 99%
rename from bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km/Person_viewAsWeb/my_career_subordination_title.xml
rename to bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/Person_viewAsWeb/my_career_subordination_title.xml
index bc164914fa..e50d176881 100644
--- a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km/Person_viewAsWeb/my_career_subordination_title.xml
+++ b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/Person_viewAsWeb/my_career_subordination_title.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="RelationStringField" module="Products.ERP5Form.RelationField"/>
-        <tuple/>
-      </tuple>
+      <global name="RelationStringField" module="Products.ERP5Form.RelationField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km/Person_viewAsWeb/my_default_address_city.xml b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/Person_viewAsWeb/my_default_address_city.xml
similarity index 98%
rename from bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km/Person_viewAsWeb/my_default_address_city.xml
rename to bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/Person_viewAsWeb/my_default_address_city.xml
index 38e967795b..8dda6b1c60 100644
--- a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km/Person_viewAsWeb/my_default_address_city.xml
+++ b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/Person_viewAsWeb/my_default_address_city.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="StringField" module="Products.Formulator.StandardFields"/>
-        <tuple/>
-      </tuple>
+      <global name="StringField" module="Products.Formulator.StandardFields"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km/Person_viewAsWeb/my_default_address_region.xml b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/Person_viewAsWeb/my_default_address_region.xml
similarity index 98%
rename from bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km/Person_viewAsWeb/my_default_address_region.xml
rename to bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/Person_viewAsWeb/my_default_address_region.xml
index 67fb9026ef..f6c3f14f87 100644
--- a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km/Person_viewAsWeb/my_default_address_region.xml
+++ b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/Person_viewAsWeb/my_default_address_region.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ListField" module="Products.Formulator.StandardFields"/>
-        <tuple/>
-      </tuple>
+      <global name="ListField" module="Products.Formulator.StandardFields"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km/Person_viewAsWeb/my_default_address_street_address.xml b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/Person_viewAsWeb/my_default_address_street_address.xml
similarity index 98%
rename from bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km/Person_viewAsWeb/my_default_address_street_address.xml
rename to bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/Person_viewAsWeb/my_default_address_street_address.xml
index b63e1ed922..45c15bf80a 100644
--- a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km/Person_viewAsWeb/my_default_address_street_address.xml
+++ b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/Person_viewAsWeb/my_default_address_street_address.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="TextAreaField" module="Products.Formulator.StandardFields"/>
-        <tuple/>
-      </tuple>
+      <global name="TextAreaField" module="Products.Formulator.StandardFields"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km/Person_viewAsWeb/my_default_address_zip_code.xml b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/Person_viewAsWeb/my_default_address_zip_code.xml
similarity index 98%
rename from bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km/Person_viewAsWeb/my_default_address_zip_code.xml
rename to bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/Person_viewAsWeb/my_default_address_zip_code.xml
index 53134650c6..23f17af1e4 100644
--- a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km/Person_viewAsWeb/my_default_address_zip_code.xml
+++ b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/Person_viewAsWeb/my_default_address_zip_code.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="StringField" module="Products.Formulator.StandardFields"/>
-        <tuple/>
-      </tuple>
+      <global name="StringField" module="Products.Formulator.StandardFields"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km/Person_viewAsWeb/my_default_email_text.xml b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/Person_viewAsWeb/my_default_email_text.xml
similarity index 98%
rename from bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km/Person_viewAsWeb/my_default_email_text.xml
rename to bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/Person_viewAsWeb/my_default_email_text.xml
index 3d8c32f91d..3f7a10701c 100644
--- a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km/Person_viewAsWeb/my_default_email_text.xml
+++ b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/Person_viewAsWeb/my_default_email_text.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="EmailField" module="Products.Formulator.StandardFields"/>
-        <tuple/>
-      </tuple>
+      <global name="EmailField" module="Products.Formulator.StandardFields"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km/Person_viewAsWeb/my_default_fax_text.xml b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/Person_viewAsWeb/my_default_fax_text.xml
similarity index 98%
rename from bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km/Person_viewAsWeb/my_default_fax_text.xml
rename to bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/Person_viewAsWeb/my_default_fax_text.xml
index bd07f169c4..b1857286bd 100644
--- a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km/Person_viewAsWeb/my_default_fax_text.xml
+++ b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/Person_viewAsWeb/my_default_fax_text.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="StringField" module="Products.Formulator.StandardFields"/>
-        <tuple/>
-      </tuple>
+      <global name="StringField" module="Products.Formulator.StandardFields"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km/Person_viewAsWeb/my_default_telephone_text.xml b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/Person_viewAsWeb/my_default_telephone_text.xml
similarity index 98%
rename from bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km/Person_viewAsWeb/my_default_telephone_text.xml
rename to bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/Person_viewAsWeb/my_default_telephone_text.xml
index 001d06141a..cba349534a 100644
--- a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km/Person_viewAsWeb/my_default_telephone_text.xml
+++ b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/Person_viewAsWeb/my_default_telephone_text.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="StringField" module="Products.Formulator.StandardFields"/>
-        <tuple/>
-      </tuple>
+      <global name="StringField" module="Products.Formulator.StandardFields"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km/Person_viewAsWeb/my_description.xml b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/Person_viewAsWeb/my_description.xml
similarity index 98%
rename from bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km/Person_viewAsWeb/my_description.xml
rename to bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/Person_viewAsWeb/my_description.xml
index 433bfd0ade..52efbd9546 100644
--- a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km/Person_viewAsWeb/my_description.xml
+++ b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/Person_viewAsWeb/my_description.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="TextAreaField" module="Products.Formulator.StandardFields"/>
-        <tuple/>
-      </tuple>
+      <global name="TextAreaField" module="Products.Formulator.StandardFields"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km/Person_viewAsWeb/my_first_name.xml b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/Person_viewAsWeb/my_first_name.xml
similarity index 98%
rename from bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km/Person_viewAsWeb/my_first_name.xml
rename to bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/Person_viewAsWeb/my_first_name.xml
index 89f7b25019..6d86cf405e 100644
--- a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km/Person_viewAsWeb/my_first_name.xml
+++ b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/Person_viewAsWeb/my_first_name.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="StringField" module="Products.Formulator.StandardFields"/>
-        <tuple/>
-      </tuple>
+      <global name="StringField" module="Products.Formulator.StandardFields"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km/Person_viewAsWeb/my_gender.xml b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/Person_viewAsWeb/my_gender.xml
similarity index 98%
rename from bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km/Person_viewAsWeb/my_gender.xml
rename to bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/Person_viewAsWeb/my_gender.xml
index ef382184bd..9dba6af96c 100644
--- a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km/Person_viewAsWeb/my_gender.xml
+++ b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/Person_viewAsWeb/my_gender.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ListField" module="Products.Formulator.StandardFields"/>
-        <tuple/>
-      </tuple>
+      <global name="ListField" module="Products.Formulator.StandardFields"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km/Person_viewAsWeb/my_last_name.xml b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/Person_viewAsWeb/my_last_name.xml
similarity index 98%
rename from bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km/Person_viewAsWeb/my_last_name.xml
rename to bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/Person_viewAsWeb/my_last_name.xml
index 85675edeaa..d1958d707c 100644
--- a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km/Person_viewAsWeb/my_last_name.xml
+++ b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/Person_viewAsWeb/my_last_name.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="StringField" module="Products.Formulator.StandardFields"/>
-        <tuple/>
-      </tuple>
+      <global name="StringField" module="Products.Formulator.StandardFields"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km/Person_viewAsWeb/my_nationality.xml b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/Person_viewAsWeb/my_nationality.xml
similarity index 98%
rename from bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km/Person_viewAsWeb/my_nationality.xml
rename to bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/Person_viewAsWeb/my_nationality.xml
index 815b1919dc..531a58ea2d 100644
--- a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km/Person_viewAsWeb/my_nationality.xml
+++ b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/Person_viewAsWeb/my_nationality.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ListField" module="Products.Formulator.StandardFields"/>
-        <tuple/>
-      </tuple>
+      <global name="ListField" module="Products.Formulator.StandardFields"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km/Person_viewAsWeb/my_translated_validation_state_title.xml b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/Person_viewAsWeb/my_translated_validation_state_title.xml
similarity index 98%
rename from bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km/Person_viewAsWeb/my_translated_validation_state_title.xml
rename to bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/Person_viewAsWeb/my_translated_validation_state_title.xml
index 0c03d503d7..2df1792813 100644
--- a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km/Person_viewAsWeb/my_translated_validation_state_title.xml
+++ b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/Person_viewAsWeb/my_translated_validation_state_title.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="StringField" module="Products.Formulator.StandardFields"/>
-        <tuple/>
-      </tuple>
+      <global name="StringField" module="Products.Formulator.StandardFields"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km/WebSection_viewAsWeb.xml b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSection_viewAsWeb.xml
similarity index 97%
rename from bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km/WebSection_viewAsWeb.xml
rename to bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSection_viewAsWeb.xml
index a68c8bafdc..bda1c1c13e 100644
--- a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km/WebSection_viewAsWeb.xml
+++ b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSection_viewAsWeb.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_km/SkinTemplateItem/portal_skins/erp5_km/WebSection_viewAsWeb/empty_section_description.xml b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSection_viewAsWeb/empty_section_description.xml
similarity index 99%
rename from bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km/WebSection_viewAsWeb/empty_section_description.xml
rename to bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSection_viewAsWeb/empty_section_description.xml
index b5e708d47f..80fe6c7df3 100644
--- a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km/WebSection_viewAsWeb/empty_section_description.xml
+++ b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSection_viewAsWeb/empty_section_description.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="EditorField" module="Products.ERP5Form.EditorField"/>
-        <tuple/>
-      </tuple>
+      <global name="EditorField" module="Products.ERP5Form.EditorField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km/WebSection_viewAsWeb/my_description.xml b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSection_viewAsWeb/my_description.xml
similarity index 98%
rename from bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km/WebSection_viewAsWeb/my_description.xml
rename to bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSection_viewAsWeb/my_description.xml
index 7961704a0f..6bf2fb8bfe 100644
--- a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km/WebSection_viewAsWeb/my_description.xml
+++ b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSection_viewAsWeb/my_description.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="TextAreaField" module="Products.Formulator.StandardFields"/>
-        <tuple/>
-      </tuple>
+      <global name="TextAreaField" module="Products.Formulator.StandardFields"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_widget_library/WebSite_loginForm.xml b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSite_loginForm.xml
similarity index 97%
rename from bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_widget_library/WebSite_loginForm.xml
rename to bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSite_loginForm.xml
index 730eb3249c..6bf673bc03 100644
--- a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_widget_library/WebSite_loginForm.xml
+++ b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSite_loginForm.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_km/SkinTemplateItem/portal_skins/erp5_km_widget_library/WebSite_loginForm/ac_login.xml b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSite_loginForm/ac_login.xml
similarity index 98%
rename from bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_widget_library/WebSite_loginForm/ac_login.xml
rename to bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSite_loginForm/ac_login.xml
index 4c1e27040b..c867f38f9c 100644
--- a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_widget_library/WebSite_loginForm/ac_login.xml
+++ b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSite_loginForm/ac_login.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="EditorField" module="Products.ERP5Form.EditorField"/>
-        <tuple/>
-      </tuple>
+      <global name="EditorField" module="Products.ERP5Form.EditorField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_widget_library/WebSite_loginForm/ac_password.xml b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSite_loginForm/ac_password.xml
similarity index 98%
rename from bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_widget_library/WebSite_loginForm/ac_password.xml
rename to bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSite_loginForm/ac_password.xml
index e666863271..4318a8e710 100644
--- a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_widget_library/WebSite_loginForm/ac_password.xml
+++ b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSite_loginForm/ac_password.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="EditorField" module="Products.ERP5Form.EditorField"/>
-        <tuple/>
-      </tuple>
+      <global name="EditorField" module="Products.ERP5Form.EditorField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_widget_library/WebSite_loginForm/came_from.xml b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSite_loginForm/came_from.xml
similarity index 97%
rename from bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_widget_library/WebSite_loginForm/came_from.xml
rename to bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSite_loginForm/came_from.xml
index 7865a2def7..2c6c917fd1 100644
--- a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_widget_library/WebSite_loginForm/came_from.xml
+++ b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSite_loginForm/came_from.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="StringField" module="Products.Formulator.StandardFields"/>
-        <tuple/>
-      </tuple>
+      <global name="StringField" module="Products.Formulator.StandardFields"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -264,10 +261,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_km/SkinTemplateItem/portal_skins/erp5_km_widget_library/WebSite_loginForm/login.xml b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSite_loginForm/login.xml
similarity index 98%
rename from bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_widget_library/WebSite_loginForm/login.xml
rename to bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSite_loginForm/login.xml
index 77638ea4ff..64b561f34c 100644
--- a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_widget_library/WebSite_loginForm/login.xml
+++ b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSite_loginForm/login.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="EditorField" module="Products.ERP5Form.EditorField"/>
-        <tuple/>
-      </tuple>
+      <global name="EditorField" module="Products.ERP5Form.EditorField"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_widget_library/WebSite_loginForm/login_message.xml b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSite_loginForm/login_message.xml
similarity index 97%
rename from bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_widget_library/WebSite_loginForm/login_message.xml
rename to bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSite_loginForm/login_message.xml
index 8f1d880679..05722c3de5 100644
--- a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_widget_library/WebSite_loginForm/login_message.xml
+++ b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSite_loginForm/login_message.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="StringField" module="Products.Formulator.StandardFields"/>
-        <tuple/>
-      </tuple>
+      <global name="StringField" module="Products.Formulator.StandardFields"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -264,10 +261,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_km/SkinTemplateItem/portal_skins/erp5_km/WebSite_viewLatestChangeList.xml b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSite_viewLatestChangeList.xml
similarity index 97%
rename from bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km/WebSite_viewLatestChangeList.xml
rename to bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSite_viewLatestChangeList.xml
index 2053db1533..8b27334b43 100644
--- a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km/WebSite_viewLatestChangeList.xml
+++ b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSite_viewLatestChangeList.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_km/SkinTemplateItem/portal_skins/erp5_km/WebSite_viewLatestChangeList/listbox.xml b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSite_viewLatestChangeList/listbox.xml
similarity index 94%
rename from bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km/WebSite_viewLatestChangeList/listbox.xml
rename to bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSite_viewLatestChangeList/listbox.xml
index eefd877ea4..3bf5572b9e 100644
--- a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km/WebSite_viewLatestChangeList/listbox.xml
+++ b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSite_viewLatestChangeList/listbox.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>
@@ -123,10 +120,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_km/SkinTemplateItem/portal_skins/erp5_km/WebSite_viewLatestChangeList/listbox_modification_date.xml b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSite_viewLatestChangeList/listbox_modification_date.xml
similarity index 96%
rename from bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km/WebSite_viewLatestChangeList/listbox_modification_date.xml
rename to bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSite_viewLatestChangeList/listbox_modification_date.xml
index ad9c3e2773..83710bca1a 100644
--- a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km/WebSite_viewLatestChangeList/listbox_modification_date.xml
+++ b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSite_viewLatestChangeList/listbox_modification_date.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_km/SkinTemplateItem/portal_skins/erp5_km/WebSite_viewLatestChangeList/listbox_thumbnail.xml b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSite_viewLatestChangeList/listbox_thumbnail.xml
similarity index 95%
rename from bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km/WebSite_viewLatestChangeList/listbox_thumbnail.xml
rename to bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSite_viewLatestChangeList/listbox_thumbnail.xml
index cfc718dd2e..54c40c3736 100644
--- a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km/WebSite_viewLatestChangeList/listbox_thumbnail.xml
+++ b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSite_viewLatestChangeList/listbox_thumbnail.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_km/SkinTemplateItem/portal_skins/erp5_km/WebSite_viewMyContentList.xml b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSite_viewMyContentList.xml
similarity index 97%
rename from bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km/WebSite_viewMyContentList.xml
rename to bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSite_viewMyContentList.xml
index 5f597ca19c..44695d348a 100644
--- a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km/WebSite_viewMyContentList.xml
+++ b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSite_viewMyContentList.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_km/SkinTemplateItem/portal_skins/erp5_km/WebSite_viewMyContentList/listbox.xml b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSite_viewMyContentList/listbox.xml
similarity index 94%
rename from bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km/WebSite_viewMyContentList/listbox.xml
rename to bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSite_viewMyContentList/listbox.xml
index 3dd38f0bf4..3fb338a8cb 100644
--- a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km/WebSite_viewMyContentList/listbox.xml
+++ b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSite_viewMyContentList/listbox.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>
@@ -149,10 +146,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>
@@ -165,10 +159,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_km/SkinTemplateItem/portal_skins/erp5_km/WebSite_viewMyContentList/listbox_modification_date.xml b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSite_viewMyContentList/listbox_modification_date.xml
similarity index 93%
rename from bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km/WebSite_viewMyContentList/listbox_modification_date.xml
rename to bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSite_viewMyContentList/listbox_modification_date.xml
index 611c2ba3df..14f5a013cc 100644
--- a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km/WebSite_viewMyContentList/listbox_modification_date.xml
+++ b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSite_viewMyContentList/listbox_modification_date.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>
@@ -106,10 +103,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_km/SkinTemplateItem/portal_skins/erp5_km/WebSite_viewMyContentList/listbox_thumbnail.xml b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSite_viewMyContentList/listbox_thumbnail.xml
similarity index 95%
rename from bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km/WebSite_viewMyContentList/listbox_thumbnail.xml
rename to bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSite_viewMyContentList/listbox_thumbnail.xml
index cfc718dd2e..54c40c3736 100644
--- a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km/WebSite_viewMyContentList/listbox_thumbnail.xml
+++ b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSite_viewMyContentList/listbox_thumbnail.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_km/SkinTemplateItem/portal_skins/erp5_km/WebSite_viewPendingEventList.xml b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSite_viewPendingEventList.xml
similarity index 97%
rename from bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km/WebSite_viewPendingEventList.xml
rename to bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSite_viewPendingEventList.xml
index 50853df71a..6d83a549ca 100644
--- a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km/WebSite_viewPendingEventList.xml
+++ b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSite_viewPendingEventList.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_km/SkinTemplateItem/portal_skins/erp5_km/WebSite_viewPendingEventList/listbox.xml b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSite_viewPendingEventList/listbox.xml
similarity index 98%
rename from bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km/WebSite_viewPendingEventList/listbox.xml
rename to bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSite_viewPendingEventList/listbox.xml
index 8869fc7fce..77cc446489 100644
--- a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km/WebSite_viewPendingEventList/listbox.xml
+++ b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSite_viewPendingEventList/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>
@@ -565,10 +562,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>
@@ -581,10 +575,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_km/SkinTemplateItem/portal_skins/erp5_km/WebSite_viewPendingEventList/listbox_modification_date.xml b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSite_viewPendingEventList/listbox_modification_date.xml
similarity index 99%
rename from bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km/WebSite_viewPendingEventList/listbox_modification_date.xml
rename to bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSite_viewPendingEventList/listbox_modification_date.xml
index a65b1e4189..8dd57f4e9a 100644
--- a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km/WebSite_viewPendingEventList/listbox_modification_date.xml
+++ b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSite_viewPendingEventList/listbox_modification_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>
diff --git a/bt5/erp5_km/bt/revision b/bt5/erp5_km/bt/revision
index 2a687c21e9..5e1a2736ff 100644
--- a/bt5/erp5_km/bt/revision
+++ b/bt5/erp5_km/bt/revision
@@ -1 +1 @@
-1564
\ No newline at end of file
+1565
\ No newline at end of file
-- 
2.30.9