diff --git a/bt5/erp5_web/CategoryTemplateItem/portal_categories/similar.xml b/bt5/erp5_web/CategoryTemplateItem/portal_categories/similar.xml
index b0e2200d5eb59df35db4bf3a039d8c82a6255e2c..c6f0d248594b1c3af3074bb1acdfe619604caab2 100644
--- a/bt5/erp5_web/CategoryTemplateItem/portal_categories/similar.xml
+++ b/bt5/erp5_web/CategoryTemplateItem/portal_categories/similar.xml
@@ -203,25 +203,13 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <tuple>
-          <string>BTrees.Length</string>
-          <string>Length</string>
-        </tuple>
-        <none/>
-      </tuple>
+      <global name="Length" module="BTrees.Length"/>
     </pickle>
     <pickle> <int>0</int> </pickle>
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <tuple>
-        <tuple>
-          <string>BTrees.OOBTree</string>
-          <string>OOBTree</string>
-        </tuple>
-        <none/>
-      </tuple>
+      <global name="OOBTree" module="BTrees._OOBTree"/>
     </pickle>
     <pickle>
       <none/>
@@ -229,13 +217,7 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <tuple>
-        <tuple>
-          <string>BTrees.OOBTree</string>
-          <string>OOBTree</string>
-        </tuple>
-        <none/>
-      </tuple>
+      <global name="OOBTree" module="BTrees._OOBTree"/>
     </pickle>
     <pickle>
       <none/>
diff --git a/bt5/erp5_web/ModuleTemplateItem/web_page_module.xml b/bt5/erp5_web/ModuleTemplateItem/web_page_module.xml
index ad575fcbb4f4cbbb131b98ce14c2957eb5336b4c..663d0b57c6375aa477292ca1965dd3b9c616e320 100644
--- a/bt5/erp5_web/ModuleTemplateItem/web_page_module.xml
+++ b/bt5/erp5_web/ModuleTemplateItem/web_page_module.xml
@@ -10,10 +10,6 @@
    <role>Author</role>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Access arbitrary user session data</name>
-   <role>Manager</role>
-  </permission>
   <permission type='tuple'>
    <name>Access contents information</name>
    <role>Assignee</role>
@@ -23,14 +19,6 @@
    <role>Author</role>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Access future portal content</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Access inactive portal content</name>
-   <role>Manager</role>
-  </permission>
   <permission type='tuple'>
    <name>Access session data</name>
    <role>Assignee</role>
@@ -40,431 +28,23 @@
    <role>Author</role>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Add Accelerated HTTP Cache Managers</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add BTreeFolder2s</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add Browser Id Manager</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add CMF Action Icons Tools</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add CMF Active Processs</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add CMF Caching Policy Managers</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add CMF Calendar Tools</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add CMF Core Tools</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add CMF Default Tools</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add CMF Report Tools</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add CMF Setup Tools</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add CMF Sites</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add CMF Unique Id Tools</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add CMFActivity Tools</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add CMFCategory Tools</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add CMFMailIn Tools</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add Configured CMF Sites</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add Content Type Registrys</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add Cookie Crumblers</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add Database Methods</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add Documents, Images, and Files</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add ERP5 Filesystem Formulator Forms</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add ERP5 Forms</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add ERP5 OOo Templates</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add ERP5 PDF Forms</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add ERP5 PDF Templates</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add ERP5 Publications</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add ERP5 Reports</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add ERP5 Sites</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add ERP5 Subscriptions</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add ERP5 Tools</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add ERP5Catalog Tools</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add ERP5Form Tools</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add ERP5Subversion Tools</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add ERP5SyncML Tools</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add ERP5Type Tools</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add ExtFiles</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add ExtImages</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add External Methods</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add Filesystem Directory Views</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add Folders</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add Formulator Forms</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add LocalContents</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add LocalFolders</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add Localizers</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add MailHost objects</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add MessageCatalogs</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add MimetypesRegistry Tools</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add Page Templates</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add Photo Folders</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add Photos</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add Pluggable Index</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add Plugin Registrys</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add PortalTransforms Tools</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add Python Scripts</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add RAM Cache Managers</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add ReStructuredText Documents</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add Session Data Manager</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add Site Roots</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add Temporary Folder</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add Transient Object Container</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add User Folders</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add Versions</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add Virtual Host Monsters</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add Vocabularies</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add Z Gadfly Database Connections</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add Z MySQL Database Connections</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add Z MySQL Deferred Database Connections</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add ZCatalogs</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add ZMailIn Clients</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add ZMailMessages</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add ZODB Mount Points</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add Zope Tutorials</name>
-   <role>Manager</role>
-  </permission>
   <permission type='tuple'>
    <name>Add portal content</name>
    <role>Assignor</role>
    <role>Author</role>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Add portal events</name>
-   <role>Manager</role>
-  </permission>
   <permission type='tuple'>
    <name>Add portal folders</name>
    <role>Assignor</role>
    <role>Author</role>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Add portal member</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add portal topics</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Change Browser Id Manager</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Change DTML Documents</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Change DTML Methods</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Change Database Connections</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Change Database Methods</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Change ExtFile/ExtImage</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Change External Methods</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Change Formulator Fields</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Change Formulator Forms</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Change Images and Files</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Change Lock Information</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Change Page Templates</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Change Photo</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Change Python Scripts</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Change Session Data Manager</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Change Versions</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Change ZMailIn</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Change ZMailMessages</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Change bindings</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Change cache managers</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Change cache settings</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Change configuration</name>
-   <role>Manager</role>
-  </permission>
   <permission type='tuple'>
    <name>Change local roles</name>
    <role>Assignor</role>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Change permissions</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Change portal events</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Change portal topics</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Change proxy roles</name>
-   <role>Manager</role>
-  </permission>
   <permission type='tuple'>
    <name>Copy or Move</name>
    <role>Assignee</role>
@@ -474,51 +54,11 @@
    <role>Author</role>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Create Transient Objects</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Create class instances</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Define permissions</name>
-   <role>Manager</role>
-  </permission>
   <permission type='tuple'>
    <name>Delete objects</name>
    <role>Assignor</role>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Download ExtFile/ExtImage</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Edit Factories</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Edit ReStructuredText</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Edit target</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>FTP access</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Import/Export objects</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Join/leave Versions</name>
-   <role>Manager</role>
-  </permission>
   <permission type='tuple'>
    <name>List folder contents</name>
    <role>Assignee</role>
@@ -528,163 +68,11 @@
    <role>Author</role>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>List portal members</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>List undoable changes</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Log Site Errors</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Log to the Event Log</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Mail forgotten password</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Manage Access Rules</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Manage Groups</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Manage Transient Object Container</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Manage Vocabulary</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Manage WebDAV Locks</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Manage Z Classes</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Manage ZCatalog Entries</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Manage ZCatalogIndex Entries</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Manage languages</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Manage messages</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Manage portal</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Manage properties</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Manage users</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Modify Cookie Crumblers</name>
-   <role>Manager</role>
-  </permission>
   <permission type='tuple'>
    <name>Modify portal content</name>
    <role>Assignor</role>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Open/Close Database Connection</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Open/Close Database Connections</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Post mail to ZMailIn</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Query Vocabulary</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Reply to item</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Request review</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Review portal content</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Save/discard Version changes</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Search ZCatalog</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Search for principals</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Set own password</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Set own properties</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Take ownership</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Test Database Connections</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Translate Content</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Undo changes</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Use Database Methods</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Use Factories</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Use mailhost services</name>
-   <role>Manager</role>
-  </permission>
   <permission type='tuple'>
    <name>View</name>
    <role>Assignee</role>
@@ -703,26 +91,6 @@
    <role>Author</role>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>View ZMailMessage</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>View management screens</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>WebDAV Lock items</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>WebDAV Unlock items</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>WebDAV access</name>
-   <role>Manager</role>
-  </permission>
  </permission_list>
  <portal_type>Web Page Module</portal_type>
  <title>Web Pages</title>
diff --git a/bt5/erp5_web/ModuleTemplateItem/web_site_module.xml b/bt5/erp5_web/ModuleTemplateItem/web_site_module.xml
index 8eb8fcede214394aa100917efc2026aa6ab72a2f..b9604a4728e4f481225e605254ef4988c4df8974 100644
--- a/bt5/erp5_web/ModuleTemplateItem/web_site_module.xml
+++ b/bt5/erp5_web/ModuleTemplateItem/web_site_module.xml
@@ -10,10 +10,6 @@
    <role>Author</role>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Access arbitrary user session data</name>
-   <role>Manager</role>
-  </permission>
   <permission type='tuple'>
    <name>Access contents information</name>
    <role>Anonymous</role>
@@ -24,14 +20,6 @@
    <role>Author</role>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Access future portal content</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Access inactive portal content</name>
-   <role>Manager</role>
-  </permission>
   <permission type='tuple'>
    <name>Access session data</name>
    <role>Assignee</role>
@@ -41,419 +29,23 @@
    <role>Author</role>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Add Accelerated HTTP Cache Managers</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add BTreeFolder2s</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add Browser Id Manager</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add CMF Action Icons Tools</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add CMF Active Processs</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add CMF Caching Policy Managers</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add CMF Calendar Tools</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add CMF Core Tools</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add CMF Default Tools</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add CMF Setup Tools</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add CMF Sites</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add CMF Unique Id Tools</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add CMFActivity Tools</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add CMFCategory Tools</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add CMFMailIn Tools</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add Configured CMF Sites</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add Content Type Registrys</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add Cookie Crumblers</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add Database Methods</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add Documents, Images, and Files</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add ERP5 Filesystem Formulator Forms</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add ERP5 Form Printouts</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add ERP5 Forms</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add ERP5 OOo Templates</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add ERP5 PDF Forms</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add ERP5 PDF Templates</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add ERP5 Publications</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add ERP5 Reports</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add ERP5 Sites</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add ERP5 Subscriptions</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add ERP5 Tools</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add ERP5Catalog Tools</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add ERP5Form Tools</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add ERP5Subversion Tools</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add ERP5SyncML Tools</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add ERP5Type Tools</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add ExtFiles</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add ExtImages</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add External Methods</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add Filesystem Directory Views</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add Folders</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add Formulator Forms</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add HBTreeFolder2s</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add LocalContents</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add LocalFolders</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add Localizers</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add MailHost objects</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add MessageCatalogs</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add MimetypesRegistry Tools</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add Page Templates</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add Pluggable Index</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add Plugin Registrys</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add PortalTransforms Tools</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add Python Scripts</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add RAM Cache Managers</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add ReStructuredText Documents</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add Session Data Manager</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add Site Roots</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add Temporary Folder</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add Transient Object Container</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add User Folders</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add Virtual Host Monsters</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add Vocabularies</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add Z Gadfly Database Connections</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add Z MySQL Database Connections</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add Z MySQL Deferred Database Connections</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add ZCatalogs</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add ZMailIn Clients</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add ZMailMessages</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add ZODB Mount Points</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add Zope Tutorials</name>
-   <role>Manager</role>
-  </permission>
   <permission type='tuple'>
    <name>Add portal content</name>
    <role>Assignor</role>
    <role>Author</role>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Add portal events</name>
-   <role>Manager</role>
-  </permission>
   <permission type='tuple'>
    <name>Add portal folders</name>
    <role>Assignor</role>
    <role>Author</role>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Add portal member</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add portal topics</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Change Browser Id Manager</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Change DTML Documents</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Change DTML Methods</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Change Database Connections</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Change Database Methods</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Change ExtFile/ExtImage</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Change External Methods</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Change Formulator Fields</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Change Formulator Forms</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Change Images and Files</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Change Lock Information</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Change Page Templates</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Change Python Scripts</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Change Session Data Manager</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Change Versions</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Change ZMailIn</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Change ZMailMessages</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Change bindings</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Change cache managers</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Change cache settings</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Change configuration</name>
-   <role>Manager</role>
-  </permission>
   <permission type='tuple'>
    <name>Change local roles</name>
    <role>Assignor</role>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Change permissions</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Change portal events</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Change portal topics</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Change proxy roles</name>
-   <role>Manager</role>
-  </permission>
   <permission type='tuple'>
    <name>Copy or Move</name>
    <role>Assignee</role>
@@ -463,51 +55,11 @@
    <role>Author</role>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Create Transient Objects</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Create class instances</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Define permissions</name>
-   <role>Manager</role>
-  </permission>
   <permission type='tuple'>
    <name>Delete objects</name>
    <role>Assignor</role>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Download ExtFile/ExtImage</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Edit Factories</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Edit ReStructuredText</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Edit target</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>FTP access</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Import/Export objects</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Join/leave Versions</name>
-   <role>Manager</role>
-  </permission>
   <permission type='tuple'>
    <name>List folder contents</name>
    <role>Assignee</role>
@@ -517,175 +69,11 @@
    <role>Author</role>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>List portal members</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>List undoable changes</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Log Site Errors</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Log to the Event Log</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Mail forgotten password</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Manage Access Rules</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Manage Groups</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Manage Selenium test cases</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Manage Transient Object Container</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Manage Vocabulary</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Manage WebDAV Locks</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Manage Z Classes</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Manage ZCatalog Entries</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Manage ZCatalogIndex Entries</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Manage extensions</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Manage languages</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Manage messages</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Manage portal</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Manage properties</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Manage users</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Modify Cookie Crumblers</name>
-   <role>Manager</role>
-  </permission>
   <permission type='tuple'>
    <name>Modify portal content</name>
    <role>Assignor</role>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Open/Close Database Connection</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Open/Close Database Connections</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Post mail to ZMailIn</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Query Vocabulary</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Reply to item</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Request review</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Review portal content</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Save/discard Version changes</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Search ZCatalog</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Search for principals</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Set own password</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Set own properties</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Take ownership</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Test Database Connections</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Translate Content</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Undo changes</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Use Database Methods</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Use Factories</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Use external editor</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Use mailhost services</name>
-   <role>Manager</role>
-  </permission>
   <permission type='tuple'>
    <name>View</name>
    <role>Anonymous</role>
@@ -704,26 +92,6 @@
    <role>Author</role>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>View ZMailMessage</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>View management screens</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>WebDAV Lock items</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>WebDAV Unlock items</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>WebDAV access</name>
-   <role>Manager</role>
-  </permission>
  </permission_list>
  <portal_type>Web Site Module</portal_type>
  <title>Web Sites</title>
diff --git a/bt5/erp5_web/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml b/bt5/erp5_web/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml
index 9c47a37bb3ea0fab120353f0628b0ad197c39367..bbff8437a1b626cf55a78d7f9677fd5ad36ceda7 100644
--- a/bt5/erp5_web/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml
+++ b/bt5/erp5_web/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml
@@ -7,16 +7,16 @@
   <item>Web Page</item>
  </portal_type>
  <portal_type id="Web Section">
-  <item>Web Section</item>
   <item>File</item>
-  <item>Role Definition</item>
   <item>Image</item>
+  <item>Role Definition</item>
+  <item>Web Section</item>
  </portal_type>
  <portal_type id="Web Site">
+  <item>File</item>
+  <item>Image</item>
   <item>Role Definition</item>
   <item>Web Section</item>
-  <item>Image</item>
-  <item>File</item>
  </portal_type>
  <portal_type id="Web Site Module">
   <item>Web Site</item>
diff --git a/bt5/erp5_web/PortalTypeBaseCategoryTemplateItem/base_category_list.xml b/bt5/erp5_web/PortalTypeBaseCategoryTemplateItem/base_category_list.xml
index 31f760a657b6156834666e8e6f1a8fbe0e1cd491..bf217e49c53e2b160512dff0cd10e2432ba2c1c1 100644
--- a/bt5/erp5_web/PortalTypeBaseCategoryTemplateItem/base_category_list.xml
+++ b/bt5/erp5_web/PortalTypeBaseCategoryTemplateItem/base_category_list.xml
@@ -1,9 +1,9 @@
 <base_category_list>
  <portal_type id="Web Page">
-  <item>successor</item>
-  <item>publication_section</item>
   <item>predecessor</item>
+  <item>publication_section</item>
   <item>similar</item>
+  <item>successor</item>
  </portal_type>
  <portal_type id="Web Page Module">
   <item>business_application</item>
diff --git a/bt5/erp5_web/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml b/bt5/erp5_web/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml
index 401138c09f13a9c928e7f7a5c904534aff730cda..a3f8e7ce8be56443f8d296ef129bf1ea47041dfc 100644
--- a/bt5/erp5_web/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml
+++ b/bt5/erp5_web/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml
@@ -13,10 +13,10 @@
  </chain>
  <chain>
   <type>Web Section</type>
-  <workflow>category_publication_workflow, local_permission_interaction_workflow, edit_workflow</workflow>
+  <workflow>category_publication_workflow, edit_workflow, local_permission_interaction_workflow</workflow>
  </chain>
  <chain>
   <type>Web Site</type>
-  <workflow>local_permission_interaction_workflow, edit_workflow, category_publication_workflow</workflow>
+  <workflow>category_publication_workflow, edit_workflow, local_permission_interaction_workflow</workflow>
  </chain>
 </workflow_chain>
\ No newline at end of file
diff --git a/bt5/erp5_web/bt/revision b/bt5/erp5_web/bt/revision
index c96148db169d30a9bff5de8d4367518b410f0947..ad7876489d45cf02eb43e74903374fdfe70a48f4 100644
--- a/bt5/erp5_web/bt/revision
+++ b/bt5/erp5_web/bt/revision
@@ -1 +1 @@
-870
\ No newline at end of file
+871
\ No newline at end of file