diff --git a/bt5/erp5_apparel/ModuleTemplateItem/apparel_assortment_module.xml b/bt5/erp5_apparel/ModuleTemplateItem/apparel_assortment_module.xml
index d51bbe178d38c0e38f874de530862f1a9f986b99..bd73f654e768bad6d83b014d4bbb6e09113c71d1 100644
--- a/bt5/erp5_apparel/ModuleTemplateItem/apparel_assortment_module.xml
+++ b/bt5/erp5_apparel/ModuleTemplateItem/apparel_assortment_module.xml
@@ -56,8 +56,9 @@
    <name>Add Browser Id Manager</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add CMF Action Icons Tools</name>
+   <role>Manager</role>
   </permission>
   <permission type='tuple'>
    <name>Add CMF Active Processs</name>
@@ -67,29 +68,33 @@
    <name>Add CMF Caching Policy Managers</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <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='list'>
+  <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='list'>
+  <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='list'>
+  <permission type='tuple'>
    <name>Add CMF Unique Id Tools</name>
+   <role>Manager</role>
   </permission>
   <permission type='tuple'>
    <name>Add CMFActivity Tools</name>
@@ -103,8 +108,9 @@
    <name>Add CMFMailIn Tools</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add Configured CMF Sites</name>
+   <role>Manager</role>
   </permission>
   <permission type='tuple'>
    <name>Add Content Type Registrys</name>
@@ -130,10 +136,11 @@
    <name>Add ERP5 Forms</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add ERP5 OOo Templates</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add ERP5 PDF Forms</name>
    <role>Manager</role>
   </permission>
@@ -169,8 +176,9 @@
    <name>Add ERP5Form Tools</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add ERP5Subversion Tools</name>
+   <role>Manager</role>
   </permission>
   <permission type='tuple'>
    <name>Add ERP5SyncML Tools</name>
@@ -225,26 +233,24 @@
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
-   <name>Add Page Templates</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add Photo Folders</name>
+   <name>Add MimetypesRegistry Tools</name>
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
-   <name>Add Photos</name>
+   <name>Add Page Templates</name>
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
    <name>Add Pluggable Index</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add Plugin Registrys</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
-   <name>Add Portal ZSyncer Tools</name>
+  <permission type='tuple'>
+   <name>Add PortalTransforms Tools</name>
+   <role>Manager</role>
   </permission>
   <permission type='tuple'>
    <name>Add Python Scripts</name>
@@ -278,10 +284,6 @@
    <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>
@@ -298,8 +300,9 @@
    <name>Add Z MySQL Database Connections</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
-   <name>Add Z MySQL Database Deferred Connections</name>
+  <permission type='tuple'>
+   <name>Add Z MySQL Deferred Database Connections</name>
+   <role>Manager</role>
   </permission>
   <permission type='tuple'>
    <name>Add ZCatalogs</name>
@@ -317,9 +320,6 @@
    <name>Add ZODB Mount Points</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
-   <name>Add ZSyncers</name>
-  </permission>
   <permission type='tuple'>
    <name>Add Zope Tutorials</name>
    <role>Manager</role>
@@ -336,6 +336,8 @@
   </permission>
   <permission type='tuple'>
    <name>Add portal folders</name>
+   <role>Assignor</role>
+   <role>Author</role>
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
@@ -394,10 +396,6 @@
    <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>
@@ -434,8 +432,10 @@
    <name>Change configuration</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Change local roles</name>
+   <role>Assignor</role>
+   <role>Manager</role>
   </permission>
   <permission type='tuple'>
    <name>Change permissions</name>
@@ -453,8 +453,17 @@
    <name>Change proxy roles</name>
    <role>Manager</role>
   </permission>
+  <permission type='tuple'>
+   <name>Change user folder</name>
+   <role>Manager</role>
+  </permission>
   <permission type='tuple'>
    <name>Copy or Move</name>
+   <role>Assignee</role>
+   <role>Assignor</role>
+   <role>Associate</role>
+   <role>Auditor</role>
+   <role>Author</role>
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
@@ -471,6 +480,7 @@
   </permission>
   <permission type='tuple'>
    <name>Delete objects</name>
+   <role>Assignor</role>
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
@@ -485,6 +495,10 @@
    <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>
@@ -530,8 +544,13 @@
    <name>Manage Access Rules</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <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>
@@ -557,6 +576,10 @@
    <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>
@@ -622,8 +645,9 @@
    <name>Search ZCatalog</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Search for principals</name>
+   <role>Manager</role>
   </permission>
   <permission type='tuple'>
    <name>Set own password</name>
@@ -667,7 +691,6 @@
    <role>Assignor</role>
    <role>Associate</role>
    <role>Auditor</role>
-   <role>Author</role>
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
@@ -699,15 +722,6 @@
    <name>WebDAV access</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
-   <name>ZSyncer: Use ZSyncer</name>
-  </permission>
-  <permission type='list'>
-   <name>ZopeProfiler: manage</name>
-  </permission>
-  <permission type='list'>
-   <name>ZopeProfiler: view</name>
-  </permission>
  </permission_list>
  <portal_type>Apparel Assortment Module</portal_type>
  <title>Apparel Assortments</title>
diff --git a/bt5/erp5_apparel/ModuleTemplateItem/apparel_bath_module.xml b/bt5/erp5_apparel/ModuleTemplateItem/apparel_bath_module.xml
index c7989018e6744f3cec92d70f64349fc23e317d26..8d5452377ff5e638596de4dbb15c436352ccc786 100644
--- a/bt5/erp5_apparel/ModuleTemplateItem/apparel_bath_module.xml
+++ b/bt5/erp5_apparel/ModuleTemplateItem/apparel_bath_module.xml
@@ -1,524 +1,726 @@
 <module>
  <id>apparel_bath_module</id>
  <permission_list>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Access Transient Objects</name>
-  </permission>
-  <permission type='list'>
+   <role>Assignee</role>
+   <role>Assignor</role>
+   <role>Associate</role>
+   <role>Auditor</role>
+   <role>Author</role>
+   <role>Manager</role>
+  </permission>
+  <permission type='tuple'>
    <name>Access arbitrary user session data</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Access contents information</name>
-  </permission>
-  <permission type='list'>
+   <role>Assignee</role>
+   <role>Assignor</role>
+   <role>Associate</role>
+   <role>Auditor</role>
+   <role>Author</role>
+   <role>Manager</role>
+  </permission>
+  <permission type='tuple'>
    <name>Access future portal content</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Access inactive portal content</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Access session data</name>
-  </permission>
-  <permission type='list'>
+   <role>Assignee</role>
+   <role>Assignor</role>
+   <role>Associate</role>
+   <role>Auditor</role>
+   <role>Author</role>
+   <role>Manager</role>
+  </permission>
+  <permission type='tuple'>
    <name>AccessContentsInformation</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add Accelerated HTTP Cache Managers</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add BTreeFolder2s</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add Browser Id Manager</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add CMF Action Icons Tools</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add CMF Active Processs</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add CMF Caching Policy Managers</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add CMF Calendar Tools</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add CMF Core Tools</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add CMF Default Tools</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add CMF Report Tools</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add CMF Setup Tools</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add CMF Sites</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add CMF Unique Id Tools</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add CMFActivity Tools</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add CMFCategory Tools</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add CMFMailIn Tools</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add Configured CMF Sites</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add Content Type Registrys</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add Cookie Crumblers</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add Database Methods</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add Documents, Images, and Files</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add ERP5 Filesystem Formulator Forms</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add ERP5 Forms</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add ERP5 OOo Templates</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add ERP5 PDF Forms</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add ERP5 PDF Templates</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add ERP5 Publications</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add ERP5 Reports</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add ERP5 Sites</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add ERP5 Subscriptions</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add ERP5 Tools</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add ERP5Catalog Tools</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add ERP5Form Tools</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add ERP5Subversion Tools</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add ERP5SyncML Tools</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add ERP5Type Tools</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add ExtFiles</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add ExtImages</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add External Methods</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add Filesystem Directory Views</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add Folders</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add Formulator Forms</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add LocalContents</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add LocalFolders</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add Localizers</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add MailHost objects</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add MessageCatalogs</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
-   <name>Add Page Templates</name>
-  </permission>
-  <permission type='list'>
-   <name>Add Photo Folders</name>
+  <permission type='tuple'>
+   <name>Add MimetypesRegistry Tools</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
-   <name>Add Photos</name>
+  <permission type='tuple'>
+   <name>Add Page Templates</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add Pluggable Index</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add Plugin Registrys</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
-   <name>Add Portal ZSyncer Tools</name>
+  <permission type='tuple'>
+   <name>Add PortalTransforms Tools</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add Python Scripts</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add RAM Cache Managers</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add ReStructuredText Documents</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add Session Data Manager</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add Site Roots</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add Temporary Folder</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add Transient Object Container</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add User Folders</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
-   <name>Add Versions</name>
-  </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add Virtual Host Monsters</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add Vocabularies</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add Z Gadfly Database Connections</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add Z MySQL Database Connections</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
-   <name>Add Z MySQL Database Deferred Connections</name>
+  <permission type='tuple'>
+   <name>Add Z MySQL Deferred Database Connections</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add ZCatalogs</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add ZMailIn Clients</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add ZMailMessages</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add ZODB Mount Points</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
-   <name>Add ZSyncers</name>
-  </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add Zope Tutorials</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add portal content</name>
+   <role>Assignor</role>
+   <role>Author</role>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add portal events</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add portal folders</name>
+   <role>Assignor</role>
+   <role>Author</role>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add portal member</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add portal topics</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Change Browser Id Manager</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Change DTML Documents</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Change DTML Methods</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Change Database Connections</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Change Database Methods</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Change ExtFile/ExtImage</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Change External Methods</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Change Formulator Fields</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Change Formulator Forms</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Change Images and Files</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Change Lock Information</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Change Page Templates</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
-   <name>Change Photo</name>
-  </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Change Python Scripts</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Change Session Data Manager</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Change Versions</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Change ZMailIn</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Change ZMailMessages</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Change bindings</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Change cache managers</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Change cache settings</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Change configuration</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Change local roles</name>
+   <role>Assignor</role>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Change permissions</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Change portal events</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Change portal topics</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Change proxy roles</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
-   <name>Copy or Move</name>
+  <permission type='tuple'>
+   <name>Change user folder</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
+   <name>Copy or Move</name>
+   <role>Assignee</role>
+   <role>Assignor</role>
+   <role>Associate</role>
+   <role>Auditor</role>
+   <role>Author</role>
+   <role>Manager</role>
+  </permission>
+  <permission type='tuple'>
    <name>Create Transient Objects</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Create class instances</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Define permissions</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Delete objects</name>
+   <role>Assignor</role>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Download ExtFile/ExtImage</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Edit Factories</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Edit ReStructuredText</name>
+   <role>Manager</role>
+  </permission>
+  <permission type='tuple'>
+   <name>Edit target</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>FTP access</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Import/Export objects</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Join/leave Versions</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>List folder contents</name>
-  </permission>
-  <permission type='list'>
+   <role>Assignee</role>
+   <role>Assignor</role>
+   <role>Associate</role>
+   <role>Auditor</role>
+   <role>Author</role>
+   <role>Manager</role>
+  </permission>
+  <permission type='tuple'>
    <name>List portal members</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>List undoable changes</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Log Site Errors</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Log to the Event Log</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Mail forgotten password</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Manage Access Rules</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Manage Groups</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <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='list'>
+  <permission type='tuple'>
    <name>Manage Vocabulary</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Manage WebDAV Locks</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Manage Z Classes</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Manage ZCatalog Entries</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <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='list'>
+  <permission type='tuple'>
    <name>Manage languages</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Manage messages</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Manage portal</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Manage properties</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Manage users</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Modify Cookie Crumblers</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Modify portal content</name>
+   <role>Assignor</role>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Open/Close Database Connection</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Open/Close Database Connections</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Post mail to ZMailIn</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Query Vocabulary</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Reply to item</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Request review</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Review portal content</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Save/discard Version changes</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Search ZCatalog</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Search for principals</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Set own password</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Set own properties</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Take ownership</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Test Database Connections</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Translate Content</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Undo changes</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Use Database Methods</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Use Factories</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Use mailhost services</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>View</name>
+   <role>Assignee</role>
+   <role>Assignor</role>
+   <role>Associate</role>
+   <role>Auditor</role>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>View History</name>
-  </permission>
-  <permission type='list'>
+   <role>Assignee</role>
+   <role>Assignor</role>
+   <role>Associate</role>
+   <role>Auditor</role>
+   <role>Author</role>
+   <role>Manager</role>
+  </permission>
+  <permission type='tuple'>
    <name>View ZMailMessage</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>View management screens</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>WebDAV Lock items</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>WebDAV Unlock items</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>WebDAV access</name>
-  </permission>
-  <permission type='list'>
-   <name>ZSyncer: Use ZSyncer</name>
-  </permission>
-  <permission type='list'>
-   <name>ZopeProfiler: manage</name>
-  </permission>
-  <permission type='list'>
-   <name>ZopeProfiler: view</name>
+   <role>Manager</role>
   </permission>
  </permission_list>
  <portal_type>Apparel Bath Module</portal_type>
diff --git a/bt5/erp5_apparel/ModuleTemplateItem/apparel_cloth_module.xml b/bt5/erp5_apparel/ModuleTemplateItem/apparel_cloth_module.xml
index 2c905c10836992c821810aad9b0a35a5bcfe1c76..d1fcada7ec47cc31635298907ce8b436103c379f 100644
--- a/bt5/erp5_apparel/ModuleTemplateItem/apparel_cloth_module.xml
+++ b/bt5/erp5_apparel/ModuleTemplateItem/apparel_cloth_module.xml
@@ -56,8 +56,9 @@
    <name>Add Browser Id Manager</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add CMF Action Icons Tools</name>
+   <role>Manager</role>
   </permission>
   <permission type='tuple'>
    <name>Add CMF Active Processs</name>
@@ -67,29 +68,33 @@
    <name>Add CMF Caching Policy Managers</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <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='list'>
+  <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='list'>
+  <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='list'>
+  <permission type='tuple'>
    <name>Add CMF Unique Id Tools</name>
+   <role>Manager</role>
   </permission>
   <permission type='tuple'>
    <name>Add CMFActivity Tools</name>
@@ -103,8 +108,9 @@
    <name>Add CMFMailIn Tools</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add Configured CMF Sites</name>
+   <role>Manager</role>
   </permission>
   <permission type='tuple'>
    <name>Add Content Type Registrys</name>
@@ -130,10 +136,11 @@
    <name>Add ERP5 Forms</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add ERP5 OOo Templates</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add ERP5 PDF Forms</name>
    <role>Manager</role>
   </permission>
@@ -169,8 +176,9 @@
    <name>Add ERP5Form Tools</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add ERP5Subversion Tools</name>
+   <role>Manager</role>
   </permission>
   <permission type='tuple'>
    <name>Add ERP5SyncML Tools</name>
@@ -225,26 +233,24 @@
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
-   <name>Add Page Templates</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add Photo Folders</name>
+   <name>Add MimetypesRegistry Tools</name>
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
-   <name>Add Photos</name>
+   <name>Add Page Templates</name>
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
    <name>Add Pluggable Index</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add Plugin Registrys</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
-   <name>Add Portal ZSyncer Tools</name>
+  <permission type='tuple'>
+   <name>Add PortalTransforms Tools</name>
+   <role>Manager</role>
   </permission>
   <permission type='tuple'>
    <name>Add Python Scripts</name>
@@ -278,10 +284,6 @@
    <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>
@@ -298,8 +300,9 @@
    <name>Add Z MySQL Database Connections</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
-   <name>Add Z MySQL Database Deferred Connections</name>
+  <permission type='tuple'>
+   <name>Add Z MySQL Deferred Database Connections</name>
+   <role>Manager</role>
   </permission>
   <permission type='tuple'>
    <name>Add ZCatalogs</name>
@@ -317,9 +320,6 @@
    <name>Add ZODB Mount Points</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
-   <name>Add ZSyncers</name>
-  </permission>
   <permission type='tuple'>
    <name>Add Zope Tutorials</name>
    <role>Manager</role>
@@ -336,6 +336,8 @@
   </permission>
   <permission type='tuple'>
    <name>Add portal folders</name>
+   <role>Assignor</role>
+   <role>Author</role>
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
@@ -394,10 +396,6 @@
    <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>
@@ -434,8 +432,10 @@
    <name>Change configuration</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Change local roles</name>
+   <role>Assignor</role>
+   <role>Manager</role>
   </permission>
   <permission type='tuple'>
    <name>Change permissions</name>
@@ -453,8 +453,17 @@
    <name>Change proxy roles</name>
    <role>Manager</role>
   </permission>
+  <permission type='tuple'>
+   <name>Change user folder</name>
+   <role>Manager</role>
+  </permission>
   <permission type='tuple'>
    <name>Copy or Move</name>
+   <role>Assignee</role>
+   <role>Assignor</role>
+   <role>Associate</role>
+   <role>Auditor</role>
+   <role>Author</role>
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
@@ -471,6 +480,7 @@
   </permission>
   <permission type='tuple'>
    <name>Delete objects</name>
+   <role>Assignor</role>
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
@@ -485,6 +495,10 @@
    <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>
@@ -530,8 +544,13 @@
    <name>Manage Access Rules</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <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>
@@ -557,6 +576,10 @@
    <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>
@@ -622,8 +645,9 @@
    <name>Search ZCatalog</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Search for principals</name>
+   <role>Manager</role>
   </permission>
   <permission type='tuple'>
    <name>Set own password</name>
@@ -667,7 +691,6 @@
    <role>Assignor</role>
    <role>Associate</role>
    <role>Auditor</role>
-   <role>Author</role>
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
@@ -699,15 +722,6 @@
    <name>WebDAV access</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
-   <name>ZSyncer: Use ZSyncer</name>
-  </permission>
-  <permission type='list'>
-   <name>ZopeProfiler: manage</name>
-  </permission>
-  <permission type='list'>
-   <name>ZopeProfiler: view</name>
-  </permission>
  </permission_list>
  <portal_type>Apparel Cloth Module</portal_type>
  <title>Apparel Clothes</title>
diff --git a/bt5/erp5_apparel/ModuleTemplateItem/apparel_colour_range_module.xml b/bt5/erp5_apparel/ModuleTemplateItem/apparel_colour_range_module.xml
index ce21e116d5aa550e0c1db660e8ad51ed0268a62b..51863c94b438338c45c835ac13c4c1b9d3cbdbff 100644
--- a/bt5/erp5_apparel/ModuleTemplateItem/apparel_colour_range_module.xml
+++ b/bt5/erp5_apparel/ModuleTemplateItem/apparel_colour_range_module.xml
@@ -56,8 +56,9 @@
    <name>Add Browser Id Manager</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add CMF Action Icons Tools</name>
+   <role>Manager</role>
   </permission>
   <permission type='tuple'>
    <name>Add CMF Active Processs</name>
@@ -67,29 +68,33 @@
    <name>Add CMF Caching Policy Managers</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <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='list'>
+  <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='list'>
+  <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='list'>
+  <permission type='tuple'>
    <name>Add CMF Unique Id Tools</name>
+   <role>Manager</role>
   </permission>
   <permission type='tuple'>
    <name>Add CMFActivity Tools</name>
@@ -103,8 +108,9 @@
    <name>Add CMFMailIn Tools</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add Configured CMF Sites</name>
+   <role>Manager</role>
   </permission>
   <permission type='tuple'>
    <name>Add Content Type Registrys</name>
@@ -130,10 +136,11 @@
    <name>Add ERP5 Forms</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add ERP5 OOo Templates</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add ERP5 PDF Forms</name>
    <role>Manager</role>
   </permission>
@@ -169,8 +176,9 @@
    <name>Add ERP5Form Tools</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add ERP5Subversion Tools</name>
+   <role>Manager</role>
   </permission>
   <permission type='tuple'>
    <name>Add ERP5SyncML Tools</name>
@@ -225,26 +233,24 @@
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
-   <name>Add Page Templates</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add Photo Folders</name>
+   <name>Add MimetypesRegistry Tools</name>
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
-   <name>Add Photos</name>
+   <name>Add Page Templates</name>
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
    <name>Add Pluggable Index</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add Plugin Registrys</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
-   <name>Add Portal ZSyncer Tools</name>
+  <permission type='tuple'>
+   <name>Add PortalTransforms Tools</name>
+   <role>Manager</role>
   </permission>
   <permission type='tuple'>
    <name>Add Python Scripts</name>
@@ -278,10 +284,6 @@
    <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>
@@ -298,8 +300,9 @@
    <name>Add Z MySQL Database Connections</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
-   <name>Add Z MySQL Database Deferred Connections</name>
+  <permission type='tuple'>
+   <name>Add Z MySQL Deferred Database Connections</name>
+   <role>Manager</role>
   </permission>
   <permission type='tuple'>
    <name>Add ZCatalogs</name>
@@ -317,9 +320,6 @@
    <name>Add ZODB Mount Points</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
-   <name>Add ZSyncers</name>
-  </permission>
   <permission type='tuple'>
    <name>Add Zope Tutorials</name>
    <role>Manager</role>
@@ -336,6 +336,8 @@
   </permission>
   <permission type='tuple'>
    <name>Add portal folders</name>
+   <role>Assignor</role>
+   <role>Author</role>
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
@@ -394,10 +396,6 @@
    <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>
@@ -434,8 +432,10 @@
    <name>Change configuration</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Change local roles</name>
+   <role>Assignor</role>
+   <role>Manager</role>
   </permission>
   <permission type='tuple'>
    <name>Change permissions</name>
@@ -453,8 +453,17 @@
    <name>Change proxy roles</name>
    <role>Manager</role>
   </permission>
+  <permission type='tuple'>
+   <name>Change user folder</name>
+   <role>Manager</role>
+  </permission>
   <permission type='tuple'>
    <name>Copy or Move</name>
+   <role>Assignee</role>
+   <role>Assignor</role>
+   <role>Associate</role>
+   <role>Auditor</role>
+   <role>Author</role>
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
@@ -471,6 +480,7 @@
   </permission>
   <permission type='tuple'>
    <name>Delete objects</name>
+   <role>Assignor</role>
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
@@ -485,6 +495,10 @@
    <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>
@@ -530,8 +544,13 @@
    <name>Manage Access Rules</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <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>
@@ -557,6 +576,10 @@
    <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>
@@ -622,8 +645,9 @@
    <name>Search ZCatalog</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Search for principals</name>
+   <role>Manager</role>
   </permission>
   <permission type='tuple'>
    <name>Set own password</name>
@@ -667,7 +691,6 @@
    <role>Assignor</role>
    <role>Associate</role>
    <role>Auditor</role>
-   <role>Author</role>
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
@@ -699,15 +722,6 @@
    <name>WebDAV access</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
-   <name>ZSyncer: Use ZSyncer</name>
-  </permission>
-  <permission type='list'>
-   <name>ZopeProfiler: manage</name>
-  </permission>
-  <permission type='list'>
-   <name>ZopeProfiler: view</name>
-  </permission>
  </permission_list>
  <portal_type>Apparel Colour Range Module</portal_type>
  <title>Apparel Colour Ranges</title>
diff --git a/bt5/erp5_apparel/ModuleTemplateItem/apparel_component_module.xml b/bt5/erp5_apparel/ModuleTemplateItem/apparel_component_module.xml
index 80bd7a09e3d6f71eb35c0a480922473639b04da7..0dc86c6af135d2c291f9b7d6540315debd1ffc4d 100644
--- a/bt5/erp5_apparel/ModuleTemplateItem/apparel_component_module.xml
+++ b/bt5/erp5_apparel/ModuleTemplateItem/apparel_component_module.xml
@@ -56,8 +56,9 @@
    <name>Add Browser Id Manager</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add CMF Action Icons Tools</name>
+   <role>Manager</role>
   </permission>
   <permission type='tuple'>
    <name>Add CMF Active Processs</name>
@@ -67,29 +68,33 @@
    <name>Add CMF Caching Policy Managers</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <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='list'>
+  <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='list'>
+  <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='list'>
+  <permission type='tuple'>
    <name>Add CMF Unique Id Tools</name>
+   <role>Manager</role>
   </permission>
   <permission type='tuple'>
    <name>Add CMFActivity Tools</name>
@@ -103,8 +108,9 @@
    <name>Add CMFMailIn Tools</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add Configured CMF Sites</name>
+   <role>Manager</role>
   </permission>
   <permission type='tuple'>
    <name>Add Content Type Registrys</name>
@@ -130,10 +136,11 @@
    <name>Add ERP5 Forms</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add ERP5 OOo Templates</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add ERP5 PDF Forms</name>
    <role>Manager</role>
   </permission>
@@ -169,8 +176,9 @@
    <name>Add ERP5Form Tools</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add ERP5Subversion Tools</name>
+   <role>Manager</role>
   </permission>
   <permission type='tuple'>
    <name>Add ERP5SyncML Tools</name>
@@ -225,26 +233,24 @@
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
-   <name>Add Page Templates</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add Photo Folders</name>
+   <name>Add MimetypesRegistry Tools</name>
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
-   <name>Add Photos</name>
+   <name>Add Page Templates</name>
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
    <name>Add Pluggable Index</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add Plugin Registrys</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
-   <name>Add Portal ZSyncer Tools</name>
+  <permission type='tuple'>
+   <name>Add PortalTransforms Tools</name>
+   <role>Manager</role>
   </permission>
   <permission type='tuple'>
    <name>Add Python Scripts</name>
@@ -278,10 +284,6 @@
    <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>
@@ -298,8 +300,9 @@
    <name>Add Z MySQL Database Connections</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
-   <name>Add Z MySQL Database Deferred Connections</name>
+  <permission type='tuple'>
+   <name>Add Z MySQL Deferred Database Connections</name>
+   <role>Manager</role>
   </permission>
   <permission type='tuple'>
    <name>Add ZCatalogs</name>
@@ -317,9 +320,6 @@
    <name>Add ZODB Mount Points</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
-   <name>Add ZSyncers</name>
-  </permission>
   <permission type='tuple'>
    <name>Add Zope Tutorials</name>
    <role>Manager</role>
@@ -336,6 +336,8 @@
   </permission>
   <permission type='tuple'>
    <name>Add portal folders</name>
+   <role>Assignor</role>
+   <role>Author</role>
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
@@ -394,10 +396,6 @@
    <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>
@@ -434,8 +432,10 @@
    <name>Change configuration</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Change local roles</name>
+   <role>Assignor</role>
+   <role>Manager</role>
   </permission>
   <permission type='tuple'>
    <name>Change permissions</name>
@@ -453,8 +453,17 @@
    <name>Change proxy roles</name>
    <role>Manager</role>
   </permission>
+  <permission type='tuple'>
+   <name>Change user folder</name>
+   <role>Manager</role>
+  </permission>
   <permission type='tuple'>
    <name>Copy or Move</name>
+   <role>Assignee</role>
+   <role>Assignor</role>
+   <role>Associate</role>
+   <role>Auditor</role>
+   <role>Author</role>
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
@@ -471,6 +480,7 @@
   </permission>
   <permission type='tuple'>
    <name>Delete objects</name>
+   <role>Assignor</role>
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
@@ -485,6 +495,10 @@
    <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>
@@ -530,8 +544,13 @@
    <name>Manage Access Rules</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <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>
@@ -557,6 +576,10 @@
    <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>
@@ -622,8 +645,9 @@
    <name>Search ZCatalog</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Search for principals</name>
+   <role>Manager</role>
   </permission>
   <permission type='tuple'>
    <name>Set own password</name>
@@ -667,7 +691,6 @@
    <role>Assignor</role>
    <role>Associate</role>
    <role>Auditor</role>
-   <role>Author</role>
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
@@ -699,15 +722,6 @@
    <name>WebDAV access</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
-   <name>ZSyncer: Use ZSyncer</name>
-  </permission>
-  <permission type='list'>
-   <name>ZopeProfiler: manage</name>
-  </permission>
-  <permission type='list'>
-   <name>ZopeProfiler: view</name>
-  </permission>
  </permission_list>
  <portal_type>Apparel Component Module</portal_type>
  <title>Apparel Components</title>
diff --git a/bt5/erp5_apparel/ModuleTemplateItem/apparel_consumption_module.xml b/bt5/erp5_apparel/ModuleTemplateItem/apparel_consumption_module.xml
index fd10a32dd2acedb8a7b3b21ea5a478042265081c..e9605900219b0bcf0b979ed8834e5f90b4ad3a83 100644
--- a/bt5/erp5_apparel/ModuleTemplateItem/apparel_consumption_module.xml
+++ b/bt5/erp5_apparel/ModuleTemplateItem/apparel_consumption_module.xml
@@ -56,8 +56,9 @@
    <name>Add Browser Id Manager</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add CMF Action Icons Tools</name>
+   <role>Manager</role>
   </permission>
   <permission type='tuple'>
    <name>Add CMF Active Processs</name>
@@ -67,29 +68,33 @@
    <name>Add CMF Caching Policy Managers</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <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='list'>
+  <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='list'>
+  <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='list'>
+  <permission type='tuple'>
    <name>Add CMF Unique Id Tools</name>
+   <role>Manager</role>
   </permission>
   <permission type='tuple'>
    <name>Add CMFActivity Tools</name>
@@ -103,8 +108,9 @@
    <name>Add CMFMailIn Tools</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add Configured CMF Sites</name>
+   <role>Manager</role>
   </permission>
   <permission type='tuple'>
    <name>Add Content Type Registrys</name>
@@ -130,10 +136,11 @@
    <name>Add ERP5 Forms</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add ERP5 OOo Templates</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add ERP5 PDF Forms</name>
    <role>Manager</role>
   </permission>
@@ -169,8 +176,9 @@
    <name>Add ERP5Form Tools</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add ERP5Subversion Tools</name>
+   <role>Manager</role>
   </permission>
   <permission type='tuple'>
    <name>Add ERP5SyncML Tools</name>
@@ -225,26 +233,24 @@
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
-   <name>Add Page Templates</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add Photo Folders</name>
+   <name>Add MimetypesRegistry Tools</name>
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
-   <name>Add Photos</name>
+   <name>Add Page Templates</name>
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
    <name>Add Pluggable Index</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add Plugin Registrys</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
-   <name>Add Portal ZSyncer Tools</name>
+  <permission type='tuple'>
+   <name>Add PortalTransforms Tools</name>
+   <role>Manager</role>
   </permission>
   <permission type='tuple'>
    <name>Add Python Scripts</name>
@@ -278,10 +284,6 @@
    <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>
@@ -298,8 +300,9 @@
    <name>Add Z MySQL Database Connections</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
-   <name>Add Z MySQL Database Deferred Connections</name>
+  <permission type='tuple'>
+   <name>Add Z MySQL Deferred Database Connections</name>
+   <role>Manager</role>
   </permission>
   <permission type='tuple'>
    <name>Add ZCatalogs</name>
@@ -317,9 +320,6 @@
    <name>Add ZODB Mount Points</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
-   <name>Add ZSyncers</name>
-  </permission>
   <permission type='tuple'>
    <name>Add Zope Tutorials</name>
    <role>Manager</role>
@@ -336,6 +336,8 @@
   </permission>
   <permission type='tuple'>
    <name>Add portal folders</name>
+   <role>Assignor</role>
+   <role>Author</role>
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
@@ -394,10 +396,6 @@
    <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>
@@ -434,8 +432,10 @@
    <name>Change configuration</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Change local roles</name>
+   <role>Assignor</role>
+   <role>Manager</role>
   </permission>
   <permission type='tuple'>
    <name>Change permissions</name>
@@ -453,8 +453,17 @@
    <name>Change proxy roles</name>
    <role>Manager</role>
   </permission>
+  <permission type='tuple'>
+   <name>Change user folder</name>
+   <role>Manager</role>
+  </permission>
   <permission type='tuple'>
    <name>Copy or Move</name>
+   <role>Assignee</role>
+   <role>Assignor</role>
+   <role>Associate</role>
+   <role>Auditor</role>
+   <role>Author</role>
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
@@ -471,6 +480,7 @@
   </permission>
   <permission type='tuple'>
    <name>Delete objects</name>
+   <role>Assignor</role>
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
@@ -485,6 +495,10 @@
    <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>
@@ -530,8 +544,13 @@
    <name>Manage Access Rules</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <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>
@@ -557,6 +576,10 @@
    <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>
@@ -622,8 +645,9 @@
    <name>Search ZCatalog</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Search for principals</name>
+   <role>Manager</role>
   </permission>
   <permission type='tuple'>
    <name>Set own password</name>
@@ -667,7 +691,6 @@
    <role>Assignor</role>
    <role>Associate</role>
    <role>Auditor</role>
-   <role>Author</role>
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
@@ -699,15 +722,6 @@
    <name>WebDAV access</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
-   <name>ZSyncer: Use ZSyncer</name>
-  </permission>
-  <permission type='list'>
-   <name>ZopeProfiler: manage</name>
-  </permission>
-  <permission type='list'>
-   <name>ZopeProfiler: view</name>
-  </permission>
  </permission_list>
  <portal_type>Apparel Consumption Module</portal_type>
  <title>Apparel Consumptions</title>
diff --git a/bt5/erp5_apparel/ModuleTemplateItem/apparel_fabric_item_module.xml b/bt5/erp5_apparel/ModuleTemplateItem/apparel_fabric_item_module.xml
index baaa5bddb4128e66b25c8d2c037dc9bf5caed0f3..46b04b9a7cf0fbd7e372ea466e4c78bea3fd0068 100644
--- a/bt5/erp5_apparel/ModuleTemplateItem/apparel_fabric_item_module.xml
+++ b/bt5/erp5_apparel/ModuleTemplateItem/apparel_fabric_item_module.xml
@@ -1,680 +1,727 @@
 <module>
  <id>apparel_fabric_item_module</id>
  <permission_list>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Access Transient Objects</name>
+   <role>Assignee</role>
+   <role>Assignor</role>
+   <role>Associate</role>
+   <role>Auditor</role>
+   <role>Author</role>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Access arbitrary user session data</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Access contents information</name>
+   <role>Assignee</role>
+   <role>Assignor</role>
+   <role>Associate</role>
+   <role>Auditor</role>
+   <role>Author</role>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Access future portal content</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Access inactive portal content</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Access session data</name>
+   <role>Assignee</role>
+   <role>Assignor</role>
+   <role>Associate</role>
+   <role>Auditor</role>
+   <role>Author</role>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>AccessContentsInformation</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add Accelerated HTTP Cache Managers</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add BTreeFolder2s</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add Browser Id Manager</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add CMF Action Icons Tools</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add CMF Active Processs</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add CMF Caching Policy Managers</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add CMF Calendar Tools</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add CMF Core Tools</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add CMF Default Tools</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add CMF Report Tools</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add CMF Setup Tools</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add CMF Sites</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add CMF Unique Id Tools</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add CMFActivity Tools</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add CMFCategory Tools</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add CMFMailIn Tools</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add Configured CMF Sites</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add Content Type Registrys</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add Cookie Crumblers</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add Database Methods</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add Documents, Images, and Files</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add ERP5 Filesystem Formulator Forms</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add ERP5 Forms</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add ERP5 OOo Templates</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add ERP5 PDF Forms</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add ERP5 PDF Templates</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add ERP5 Publications</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add ERP5 Reports</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add ERP5 Sites</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add ERP5 Subscriptions</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add ERP5 Tools</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add ERP5Catalog Tools</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add ERP5Form Tools</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add ERP5Subversion Tools</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add ERP5SyncML Tools</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add ERP5Type Tools</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add ExtFiles</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add ExtImages</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add External Methods</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add Filesystem Directory Views</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add Folders</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add Formulator Forms</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add LocalContents</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add LocalFolders</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add Localizers</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add MailHost objects</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add MessageCatalogs</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
-   <name>Add Page Templates</name>
+  <permission type='tuple'>
+   <name>Add MimetypesRegistry Tools</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
-   <name>Add Photo Folders</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='list'>
-   <name>Add Photos</name>
+  <permission type='tuple'>
+   <name>Add Page Templates</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add Pluggable Index</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add Plugin Registrys</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
-   <name>Add Portal ZSyncer Tools</name>
+  <permission type='tuple'>
+   <name>Add PortalTransforms Tools</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add Python Scripts</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add RAM Cache Managers</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add ReStructuredText Documents</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add Session Data Manager</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add Site Roots</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add Temporary Folder</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add Transient Object Container</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add User Folders</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
-   <name>Add Versions</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add Virtual Host Monsters</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add Vocabularies</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add Z Gadfly Database Connections</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add Z MySQL Database Connections</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
-   <name>Add Z MySQL Database Deferred Connections</name>
+  <permission type='tuple'>
+   <name>Add Z MySQL Deferred Database Connections</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add ZCatalogs</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add ZMailIn Clients</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add ZMailMessages</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add ZODB Mount Points</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
-   <name>Add ZSyncers</name>
-  </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add Zope Tutorials</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add portal content</name>
+   <role>Assignor</role>
+   <role>Author</role>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add portal events</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add portal folders</name>
+   <role>Assignor</role>
+   <role>Author</role>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add portal member</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add portal topics</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Change Browser Id Manager</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Change DTML Documents</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Change DTML Methods</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Change Database Connections</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Change Database Methods</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Change ExtFile/ExtImage</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Change External Methods</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Change Formulator Fields</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Change Formulator Forms</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Change Images and Files</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Change Lock Information</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Change Page Templates</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
-   <name>Change Photo</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Change Python Scripts</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Change Session Data Manager</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Change Versions</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Change ZMailIn</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Change ZMailMessages</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Change bindings</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Change cache managers</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Change cache settings</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Change configuration</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Change local roles</name>
+   <role>Assignor</role>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Change permissions</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Change portal events</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Change portal topics</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Change proxy roles</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
+   <name>Change user folder</name>
+   <role>Manager</role>
+  </permission>
+  <permission type='tuple'>
    <name>Copy or Move</name>
+   <role>Assignee</role>
+   <role>Assignor</role>
+   <role>Associate</role>
+   <role>Auditor</role>
+   <role>Author</role>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Create Transient Objects</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Create class instances</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Define permissions</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Delete objects</name>
+   <role>Assignor</role>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Download ExtFile/ExtImage</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Edit Factories</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Edit ReStructuredText</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
+   <name>Edit target</name>
+   <role>Manager</role>
+  </permission>
+  <permission type='tuple'>
    <name>FTP access</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Import/Export objects</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Join/leave Versions</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>List folder contents</name>
+   <role>Assignee</role>
+   <role>Assignor</role>
+   <role>Associate</role>
+   <role>Auditor</role>
+   <role>Author</role>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>List portal members</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>List undoable changes</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Log Site Errors</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Log to the Event Log</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Mail forgotten password</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Manage Access Rules</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Manage Groups</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <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='list'>
+  <permission type='tuple'>
    <name>Manage Vocabulary</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Manage WebDAV Locks</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Manage Z Classes</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Manage ZCatalog Entries</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Manage ZCatalogIndex Entries</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
+   <name>Manage extensions</name>
+   <role>Manager</role>
+  </permission>
+  <permission type='tuple'>
    <name>Manage languages</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Manage messages</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Manage portal</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Manage properties</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Manage users</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Modify Cookie Crumblers</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Modify portal content</name>
+   <role>Assignor</role>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Open/Close Database Connection</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Open/Close Database Connections</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Post mail to ZMailIn</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Query Vocabulary</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Reply to item</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Request review</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Review portal content</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Save/discard Version changes</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Search ZCatalog</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Search for principals</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Set own password</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Set own properties</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Take ownership</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Test Database Connections</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Translate Content</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Undo changes</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Use Database Methods</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Use Factories</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Use mailhost services</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>View</name>
+   <role>Assignee</role>
+   <role>Assignor</role>
+   <role>Associate</role>
+   <role>Auditor</role>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>View History</name>
+   <role>Assignee</role>
+   <role>Assignor</role>
+   <role>Associate</role>
+   <role>Auditor</role>
+   <role>Author</role>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>View ZMailMessage</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>View management screens</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>WebDAV Lock items</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>WebDAV Unlock items</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>WebDAV access</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
-   <name>ZSyncer: Use ZSyncer</name>
-  </permission>
-  <permission type='list'>
-   <name>ZopeProfiler: manage</name>
-  </permission>
-  <permission type='list'>
-   <name>ZopeProfiler: view</name>
-  </permission>
  </permission_list>
  <portal_type>Apparel Fabric Item Module</portal_type>
  <title>Apparel Fabric Items</title>
diff --git a/bt5/erp5_apparel/ModuleTemplateItem/apparel_fabric_module.xml b/bt5/erp5_apparel/ModuleTemplateItem/apparel_fabric_module.xml
index 9eed7566305ff466497b334846318408e9a5cf25..6cd7eb73aae55eac4994b79276590529aa1e887d 100644
--- a/bt5/erp5_apparel/ModuleTemplateItem/apparel_fabric_module.xml
+++ b/bt5/erp5_apparel/ModuleTemplateItem/apparel_fabric_module.xml
@@ -56,8 +56,9 @@
    <name>Add Browser Id Manager</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add CMF Action Icons Tools</name>
+   <role>Manager</role>
   </permission>
   <permission type='tuple'>
    <name>Add CMF Active Processs</name>
@@ -67,29 +68,33 @@
    <name>Add CMF Caching Policy Managers</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <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='list'>
+  <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='list'>
+  <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='list'>
+  <permission type='tuple'>
    <name>Add CMF Unique Id Tools</name>
+   <role>Manager</role>
   </permission>
   <permission type='tuple'>
    <name>Add CMFActivity Tools</name>
@@ -103,8 +108,9 @@
    <name>Add CMFMailIn Tools</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add Configured CMF Sites</name>
+   <role>Manager</role>
   </permission>
   <permission type='tuple'>
    <name>Add Content Type Registrys</name>
@@ -130,10 +136,11 @@
    <name>Add ERP5 Forms</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add ERP5 OOo Templates</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add ERP5 PDF Forms</name>
    <role>Manager</role>
   </permission>
@@ -169,8 +176,9 @@
    <name>Add ERP5Form Tools</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add ERP5Subversion Tools</name>
+   <role>Manager</role>
   </permission>
   <permission type='tuple'>
    <name>Add ERP5SyncML Tools</name>
@@ -225,26 +233,24 @@
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
-   <name>Add Page Templates</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add Photo Folders</name>
+   <name>Add MimetypesRegistry Tools</name>
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
-   <name>Add Photos</name>
+   <name>Add Page Templates</name>
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
    <name>Add Pluggable Index</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add Plugin Registrys</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
-   <name>Add Portal ZSyncer Tools</name>
+  <permission type='tuple'>
+   <name>Add PortalTransforms Tools</name>
+   <role>Manager</role>
   </permission>
   <permission type='tuple'>
    <name>Add Python Scripts</name>
@@ -278,10 +284,6 @@
    <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>
@@ -298,8 +300,9 @@
    <name>Add Z MySQL Database Connections</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
-   <name>Add Z MySQL Database Deferred Connections</name>
+  <permission type='tuple'>
+   <name>Add Z MySQL Deferred Database Connections</name>
+   <role>Manager</role>
   </permission>
   <permission type='tuple'>
    <name>Add ZCatalogs</name>
@@ -317,9 +320,6 @@
    <name>Add ZODB Mount Points</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
-   <name>Add ZSyncers</name>
-  </permission>
   <permission type='tuple'>
    <name>Add Zope Tutorials</name>
    <role>Manager</role>
@@ -336,6 +336,8 @@
   </permission>
   <permission type='tuple'>
    <name>Add portal folders</name>
+   <role>Assignor</role>
+   <role>Author</role>
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
@@ -394,10 +396,6 @@
    <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>
@@ -434,8 +432,10 @@
    <name>Change configuration</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Change local roles</name>
+   <role>Assignor</role>
+   <role>Manager</role>
   </permission>
   <permission type='tuple'>
    <name>Change permissions</name>
@@ -453,8 +453,17 @@
    <name>Change proxy roles</name>
    <role>Manager</role>
   </permission>
+  <permission type='tuple'>
+   <name>Change user folder</name>
+   <role>Manager</role>
+  </permission>
   <permission type='tuple'>
    <name>Copy or Move</name>
+   <role>Assignee</role>
+   <role>Assignor</role>
+   <role>Associate</role>
+   <role>Auditor</role>
+   <role>Author</role>
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
@@ -471,6 +480,7 @@
   </permission>
   <permission type='tuple'>
    <name>Delete objects</name>
+   <role>Assignor</role>
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
@@ -485,6 +495,10 @@
    <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>
@@ -530,8 +544,13 @@
    <name>Manage Access Rules</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <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>
@@ -557,6 +576,10 @@
    <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>
@@ -622,8 +645,9 @@
    <name>Search ZCatalog</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Search for principals</name>
+   <role>Manager</role>
   </permission>
   <permission type='tuple'>
    <name>Set own password</name>
@@ -667,7 +691,6 @@
    <role>Assignor</role>
    <role>Associate</role>
    <role>Auditor</role>
-   <role>Author</role>
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
@@ -699,15 +722,6 @@
    <name>WebDAV access</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
-   <name>ZSyncer: Use ZSyncer</name>
-  </permission>
-  <permission type='list'>
-   <name>ZopeProfiler: manage</name>
-  </permission>
-  <permission type='list'>
-   <name>ZopeProfiler: view</name>
-  </permission>
  </permission_list>
  <portal_type>Apparel Fabric Module</portal_type>
  <title>Apparel Fabrics</title>
diff --git a/bt5/erp5_apparel/ModuleTemplateItem/apparel_measurement_module.xml b/bt5/erp5_apparel/ModuleTemplateItem/apparel_measurement_module.xml
index 530703c79b40d1e1f3615ad4c54a7d12de02ef8d..0246e39c2a0eac964686484799421dd6db32c564 100644
--- a/bt5/erp5_apparel/ModuleTemplateItem/apparel_measurement_module.xml
+++ b/bt5/erp5_apparel/ModuleTemplateItem/apparel_measurement_module.xml
@@ -56,8 +56,9 @@
    <name>Add Browser Id Manager</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add CMF Action Icons Tools</name>
+   <role>Manager</role>
   </permission>
   <permission type='tuple'>
    <name>Add CMF Active Processs</name>
@@ -67,29 +68,33 @@
    <name>Add CMF Caching Policy Managers</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <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='list'>
+  <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='list'>
+  <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='list'>
+  <permission type='tuple'>
    <name>Add CMF Unique Id Tools</name>
+   <role>Manager</role>
   </permission>
   <permission type='tuple'>
    <name>Add CMFActivity Tools</name>
@@ -103,8 +108,9 @@
    <name>Add CMFMailIn Tools</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add Configured CMF Sites</name>
+   <role>Manager</role>
   </permission>
   <permission type='tuple'>
    <name>Add Content Type Registrys</name>
@@ -130,10 +136,11 @@
    <name>Add ERP5 Forms</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add ERP5 OOo Templates</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add ERP5 PDF Forms</name>
    <role>Manager</role>
   </permission>
@@ -169,8 +176,9 @@
    <name>Add ERP5Form Tools</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add ERP5Subversion Tools</name>
+   <role>Manager</role>
   </permission>
   <permission type='tuple'>
    <name>Add ERP5SyncML Tools</name>
@@ -225,26 +233,24 @@
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
-   <name>Add Page Templates</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add Photo Folders</name>
+   <name>Add MimetypesRegistry Tools</name>
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
-   <name>Add Photos</name>
+   <name>Add Page Templates</name>
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
    <name>Add Pluggable Index</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add Plugin Registrys</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
-   <name>Add Portal ZSyncer Tools</name>
+  <permission type='tuple'>
+   <name>Add PortalTransforms Tools</name>
+   <role>Manager</role>
   </permission>
   <permission type='tuple'>
    <name>Add Python Scripts</name>
@@ -278,10 +284,6 @@
    <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>
@@ -298,8 +300,9 @@
    <name>Add Z MySQL Database Connections</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
-   <name>Add Z MySQL Database Deferred Connections</name>
+  <permission type='tuple'>
+   <name>Add Z MySQL Deferred Database Connections</name>
+   <role>Manager</role>
   </permission>
   <permission type='tuple'>
    <name>Add ZCatalogs</name>
@@ -317,9 +320,6 @@
    <name>Add ZODB Mount Points</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
-   <name>Add ZSyncers</name>
-  </permission>
   <permission type='tuple'>
    <name>Add Zope Tutorials</name>
    <role>Manager</role>
@@ -336,6 +336,8 @@
   </permission>
   <permission type='tuple'>
    <name>Add portal folders</name>
+   <role>Assignor</role>
+   <role>Author</role>
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
@@ -394,10 +396,6 @@
    <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>
@@ -434,8 +432,10 @@
    <name>Change configuration</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Change local roles</name>
+   <role>Assignor</role>
+   <role>Manager</role>
   </permission>
   <permission type='tuple'>
    <name>Change permissions</name>
@@ -453,8 +453,17 @@
    <name>Change proxy roles</name>
    <role>Manager</role>
   </permission>
+  <permission type='tuple'>
+   <name>Change user folder</name>
+   <role>Manager</role>
+  </permission>
   <permission type='tuple'>
    <name>Copy or Move</name>
+   <role>Assignee</role>
+   <role>Assignor</role>
+   <role>Associate</role>
+   <role>Auditor</role>
+   <role>Author</role>
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
@@ -471,6 +480,7 @@
   </permission>
   <permission type='tuple'>
    <name>Delete objects</name>
+   <role>Assignor</role>
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
@@ -485,6 +495,10 @@
    <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>
@@ -530,8 +544,13 @@
    <name>Manage Access Rules</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <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>
@@ -557,6 +576,10 @@
    <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>
@@ -622,8 +645,9 @@
    <name>Search ZCatalog</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Search for principals</name>
+   <role>Manager</role>
   </permission>
   <permission type='tuple'>
    <name>Set own password</name>
@@ -667,7 +691,6 @@
    <role>Assignor</role>
    <role>Associate</role>
    <role>Auditor</role>
-   <role>Author</role>
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
@@ -699,15 +722,6 @@
    <name>WebDAV access</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
-   <name>ZSyncer: Use ZSyncer</name>
-  </permission>
-  <permission type='list'>
-   <name>ZopeProfiler: manage</name>
-  </permission>
-  <permission type='list'>
-   <name>ZopeProfiler: view</name>
-  </permission>
  </permission_list>
  <portal_type>Apparel Measurement Module</portal_type>
  <title>Apparel Measurements</title>
diff --git a/bt5/erp5_apparel/ModuleTemplateItem/apparel_model_module.xml b/bt5/erp5_apparel/ModuleTemplateItem/apparel_model_module.xml
index adaaee7ef788e53bb6390cda87dbe19fcd17470f..60250e94ba0a65f47eabd91eb01683b31050321f 100644
--- a/bt5/erp5_apparel/ModuleTemplateItem/apparel_model_module.xml
+++ b/bt5/erp5_apparel/ModuleTemplateItem/apparel_model_module.xml
@@ -56,8 +56,9 @@
    <name>Add Browser Id Manager</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add CMF Action Icons Tools</name>
+   <role>Manager</role>
   </permission>
   <permission type='tuple'>
    <name>Add CMF Active Processs</name>
@@ -67,29 +68,33 @@
    <name>Add CMF Caching Policy Managers</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <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='list'>
+  <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='list'>
+  <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='list'>
+  <permission type='tuple'>
    <name>Add CMF Unique Id Tools</name>
+   <role>Manager</role>
   </permission>
   <permission type='tuple'>
    <name>Add CMFActivity Tools</name>
@@ -103,8 +108,9 @@
    <name>Add CMFMailIn Tools</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add Configured CMF Sites</name>
+   <role>Manager</role>
   </permission>
   <permission type='tuple'>
    <name>Add Content Type Registrys</name>
@@ -130,10 +136,11 @@
    <name>Add ERP5 Forms</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add ERP5 OOo Templates</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add ERP5 PDF Forms</name>
    <role>Manager</role>
   </permission>
@@ -169,8 +176,9 @@
    <name>Add ERP5Form Tools</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add ERP5Subversion Tools</name>
+   <role>Manager</role>
   </permission>
   <permission type='tuple'>
    <name>Add ERP5SyncML Tools</name>
@@ -225,26 +233,24 @@
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
-   <name>Add Page Templates</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add Photo Folders</name>
+   <name>Add MimetypesRegistry Tools</name>
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
-   <name>Add Photos</name>
+   <name>Add Page Templates</name>
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
    <name>Add Pluggable Index</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add Plugin Registrys</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
-   <name>Add Portal ZSyncer Tools</name>
+  <permission type='tuple'>
+   <name>Add PortalTransforms Tools</name>
+   <role>Manager</role>
   </permission>
   <permission type='tuple'>
    <name>Add Python Scripts</name>
@@ -278,10 +284,6 @@
    <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>
@@ -298,8 +300,9 @@
    <name>Add Z MySQL Database Connections</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
-   <name>Add Z MySQL Database Deferred Connections</name>
+  <permission type='tuple'>
+   <name>Add Z MySQL Deferred Database Connections</name>
+   <role>Manager</role>
   </permission>
   <permission type='tuple'>
    <name>Add ZCatalogs</name>
@@ -317,9 +320,6 @@
    <name>Add ZODB Mount Points</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
-   <name>Add ZSyncers</name>
-  </permission>
   <permission type='tuple'>
    <name>Add Zope Tutorials</name>
    <role>Manager</role>
@@ -336,6 +336,8 @@
   </permission>
   <permission type='tuple'>
    <name>Add portal folders</name>
+   <role>Assignor</role>
+   <role>Author</role>
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
@@ -394,10 +396,6 @@
    <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>
@@ -434,8 +432,10 @@
    <name>Change configuration</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Change local roles</name>
+   <role>Assignor</role>
+   <role>Manager</role>
   </permission>
   <permission type='tuple'>
    <name>Change permissions</name>
@@ -453,8 +453,17 @@
    <name>Change proxy roles</name>
    <role>Manager</role>
   </permission>
+  <permission type='tuple'>
+   <name>Change user folder</name>
+   <role>Manager</role>
+  </permission>
   <permission type='tuple'>
    <name>Copy or Move</name>
+   <role>Assignee</role>
+   <role>Assignor</role>
+   <role>Associate</role>
+   <role>Auditor</role>
+   <role>Author</role>
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
@@ -471,6 +480,7 @@
   </permission>
   <permission type='tuple'>
    <name>Delete objects</name>
+   <role>Assignor</role>
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
@@ -485,6 +495,10 @@
    <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>
@@ -530,8 +544,13 @@
    <name>Manage Access Rules</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <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>
@@ -557,6 +576,10 @@
    <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>
@@ -622,8 +645,9 @@
    <name>Search ZCatalog</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Search for principals</name>
+   <role>Manager</role>
   </permission>
   <permission type='tuple'>
    <name>Set own password</name>
@@ -667,7 +691,6 @@
    <role>Assignor</role>
    <role>Associate</role>
    <role>Auditor</role>
-   <role>Author</role>
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
@@ -699,15 +722,6 @@
    <name>WebDAV access</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
-   <name>ZSyncer: Use ZSyncer</name>
-  </permission>
-  <permission type='list'>
-   <name>ZopeProfiler: manage</name>
-  </permission>
-  <permission type='list'>
-   <name>ZopeProfiler: view</name>
-  </permission>
  </permission_list>
  <portal_type>Apparel Model Module</portal_type>
  <title>Apparel Models</title>
diff --git a/bt5/erp5_apparel/ModuleTemplateItem/apparel_shape_module.xml b/bt5/erp5_apparel/ModuleTemplateItem/apparel_shape_module.xml
index adb932abcca23e7c9888b43e350d9be26c4d101d..1033c4d1e57af80d6383c0119202f0e4b21bc47a 100644
--- a/bt5/erp5_apparel/ModuleTemplateItem/apparel_shape_module.xml
+++ b/bt5/erp5_apparel/ModuleTemplateItem/apparel_shape_module.xml
@@ -56,8 +56,9 @@
    <name>Add Browser Id Manager</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add CMF Action Icons Tools</name>
+   <role>Manager</role>
   </permission>
   <permission type='tuple'>
    <name>Add CMF Active Processs</name>
@@ -67,29 +68,33 @@
    <name>Add CMF Caching Policy Managers</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <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='list'>
+  <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='list'>
+  <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='list'>
+  <permission type='tuple'>
    <name>Add CMF Unique Id Tools</name>
+   <role>Manager</role>
   </permission>
   <permission type='tuple'>
    <name>Add CMFActivity Tools</name>
@@ -103,8 +108,9 @@
    <name>Add CMFMailIn Tools</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add Configured CMF Sites</name>
+   <role>Manager</role>
   </permission>
   <permission type='tuple'>
    <name>Add Content Type Registrys</name>
@@ -130,10 +136,11 @@
    <name>Add ERP5 Forms</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add ERP5 OOo Templates</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add ERP5 PDF Forms</name>
    <role>Manager</role>
   </permission>
@@ -169,8 +176,9 @@
    <name>Add ERP5Form Tools</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add ERP5Subversion Tools</name>
+   <role>Manager</role>
   </permission>
   <permission type='tuple'>
    <name>Add ERP5SyncML Tools</name>
@@ -225,26 +233,24 @@
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
-   <name>Add Page Templates</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add Photo Folders</name>
+   <name>Add MimetypesRegistry Tools</name>
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
-   <name>Add Photos</name>
+   <name>Add Page Templates</name>
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
    <name>Add Pluggable Index</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add Plugin Registrys</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
-   <name>Add Portal ZSyncer Tools</name>
+  <permission type='tuple'>
+   <name>Add PortalTransforms Tools</name>
+   <role>Manager</role>
   </permission>
   <permission type='tuple'>
    <name>Add Python Scripts</name>
@@ -278,10 +284,6 @@
    <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>
@@ -298,8 +300,9 @@
    <name>Add Z MySQL Database Connections</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
-   <name>Add Z MySQL Database Deferred Connections</name>
+  <permission type='tuple'>
+   <name>Add Z MySQL Deferred Database Connections</name>
+   <role>Manager</role>
   </permission>
   <permission type='tuple'>
    <name>Add ZCatalogs</name>
@@ -317,9 +320,6 @@
    <name>Add ZODB Mount Points</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
-   <name>Add ZSyncers</name>
-  </permission>
   <permission type='tuple'>
    <name>Add Zope Tutorials</name>
    <role>Manager</role>
@@ -336,6 +336,8 @@
   </permission>
   <permission type='tuple'>
    <name>Add portal folders</name>
+   <role>Assignor</role>
+   <role>Author</role>
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
@@ -394,10 +396,6 @@
    <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>
@@ -434,8 +432,10 @@
    <name>Change configuration</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Change local roles</name>
+   <role>Assignor</role>
+   <role>Manager</role>
   </permission>
   <permission type='tuple'>
    <name>Change permissions</name>
@@ -453,8 +453,17 @@
    <name>Change proxy roles</name>
    <role>Manager</role>
   </permission>
+  <permission type='tuple'>
+   <name>Change user folder</name>
+   <role>Manager</role>
+  </permission>
   <permission type='tuple'>
    <name>Copy or Move</name>
+   <role>Assignee</role>
+   <role>Assignor</role>
+   <role>Associate</role>
+   <role>Auditor</role>
+   <role>Author</role>
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
@@ -471,6 +480,7 @@
   </permission>
   <permission type='tuple'>
    <name>Delete objects</name>
+   <role>Assignor</role>
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
@@ -485,6 +495,10 @@
    <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>
@@ -530,8 +544,13 @@
    <name>Manage Access Rules</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <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>
@@ -557,6 +576,10 @@
    <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>
@@ -622,8 +645,9 @@
    <name>Search ZCatalog</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Search for principals</name>
+   <role>Manager</role>
   </permission>
   <permission type='tuple'>
    <name>Set own password</name>
@@ -667,7 +691,6 @@
    <role>Assignor</role>
    <role>Associate</role>
    <role>Auditor</role>
-   <role>Author</role>
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
@@ -699,15 +722,6 @@
    <name>WebDAV access</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
-   <name>ZSyncer: Use ZSyncer</name>
-  </permission>
-  <permission type='list'>
-   <name>ZopeProfiler: manage</name>
-  </permission>
-  <permission type='list'>
-   <name>ZopeProfiler: view</name>
-  </permission>
  </permission_list>
  <portal_type>Apparel Shape Module</portal_type>
  <title>Apparel Shapes</title>
diff --git a/bt5/erp5_apparel/ModuleTemplateItem/apparel_size_module.xml b/bt5/erp5_apparel/ModuleTemplateItem/apparel_size_module.xml
index 2b477b3bd2ded49aed35601f91ce8c5c08f976dc..6f4ce283805bdb52df3d49a35993228d6de0fe10 100644
--- a/bt5/erp5_apparel/ModuleTemplateItem/apparel_size_module.xml
+++ b/bt5/erp5_apparel/ModuleTemplateItem/apparel_size_module.xml
@@ -1,680 +1,727 @@
 <module>
  <id>apparel_size_module</id>
  <permission_list>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Access Transient Objects</name>
+   <role>Assignee</role>
+   <role>Assignor</role>
+   <role>Associate</role>
+   <role>Auditor</role>
+   <role>Author</role>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Access arbitrary user session data</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Access contents information</name>
+   <role>Assignee</role>
+   <role>Assignor</role>
+   <role>Associate</role>
+   <role>Auditor</role>
+   <role>Author</role>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Access future portal content</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Access inactive portal content</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Access session data</name>
+   <role>Assignee</role>
+   <role>Assignor</role>
+   <role>Associate</role>
+   <role>Auditor</role>
+   <role>Author</role>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>AccessContentsInformation</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add Accelerated HTTP Cache Managers</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add BTreeFolder2s</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add Browser Id Manager</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add CMF Action Icons Tools</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add CMF Active Processs</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add CMF Caching Policy Managers</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add CMF Calendar Tools</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add CMF Core Tools</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add CMF Default Tools</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add CMF Report Tools</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add CMF Setup Tools</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add CMF Sites</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add CMF Unique Id Tools</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add CMFActivity Tools</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add CMFCategory Tools</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add CMFMailIn Tools</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add Configured CMF Sites</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add Content Type Registrys</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add Cookie Crumblers</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add Database Methods</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add Documents, Images, and Files</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add ERP5 Filesystem Formulator Forms</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add ERP5 Forms</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add ERP5 OOo Templates</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add ERP5 PDF Forms</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add ERP5 PDF Templates</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add ERP5 Publications</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add ERP5 Reports</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add ERP5 Sites</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add ERP5 Subscriptions</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add ERP5 Tools</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add ERP5Catalog Tools</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add ERP5Form Tools</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add ERP5Subversion Tools</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add ERP5SyncML Tools</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add ERP5Type Tools</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add ExtFiles</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add ExtImages</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add External Methods</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add Filesystem Directory Views</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add Folders</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add Formulator Forms</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add LocalContents</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add LocalFolders</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add Localizers</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add MailHost objects</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add MessageCatalogs</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
-   <name>Add Page Templates</name>
+  <permission type='tuple'>
+   <name>Add MimetypesRegistry Tools</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
-   <name>Add Photo Folders</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='list'>
-   <name>Add Photos</name>
+  <permission type='tuple'>
+   <name>Add Page Templates</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add Pluggable Index</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add Plugin Registrys</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
-   <name>Add Portal ZSyncer Tools</name>
+  <permission type='tuple'>
+   <name>Add PortalTransforms Tools</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add Python Scripts</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add RAM Cache Managers</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add ReStructuredText Documents</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add Session Data Manager</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add Site Roots</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add Temporary Folder</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add Transient Object Container</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add User Folders</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
-   <name>Add Versions</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add Virtual Host Monsters</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add Vocabularies</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add Z Gadfly Database Connections</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add Z MySQL Database Connections</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
-   <name>Add Z MySQL Database Deferred Connections</name>
+  <permission type='tuple'>
+   <name>Add Z MySQL Deferred Database Connections</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add ZCatalogs</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add ZMailIn Clients</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add ZMailMessages</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add ZODB Mount Points</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
-   <name>Add ZSyncers</name>
-  </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add Zope Tutorials</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add portal content</name>
+   <role>Assignor</role>
+   <role>Author</role>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add portal events</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add portal folders</name>
+   <role>Assignor</role>
+   <role>Author</role>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add portal member</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add portal topics</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Change Browser Id Manager</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Change DTML Documents</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Change DTML Methods</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Change Database Connections</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Change Database Methods</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Change ExtFile/ExtImage</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Change External Methods</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Change Formulator Fields</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Change Formulator Forms</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Change Images and Files</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Change Lock Information</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Change Page Templates</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
-   <name>Change Photo</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Change Python Scripts</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Change Session Data Manager</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Change Versions</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Change ZMailIn</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Change ZMailMessages</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Change bindings</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Change cache managers</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Change cache settings</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Change configuration</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Change local roles</name>
+   <role>Assignor</role>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Change permissions</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Change portal events</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Change portal topics</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Change proxy roles</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
+   <name>Change user folder</name>
+   <role>Manager</role>
+  </permission>
+  <permission type='tuple'>
    <name>Copy or Move</name>
+   <role>Assignee</role>
+   <role>Assignor</role>
+   <role>Associate</role>
+   <role>Auditor</role>
+   <role>Author</role>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Create Transient Objects</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Create class instances</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Define permissions</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Delete objects</name>
+   <role>Assignor</role>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Download ExtFile/ExtImage</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Edit Factories</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Edit ReStructuredText</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
+   <name>Edit target</name>
+   <role>Manager</role>
+  </permission>
+  <permission type='tuple'>
    <name>FTP access</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Import/Export objects</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Join/leave Versions</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>List folder contents</name>
+   <role>Assignee</role>
+   <role>Assignor</role>
+   <role>Associate</role>
+   <role>Auditor</role>
+   <role>Author</role>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>List portal members</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>List undoable changes</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Log Site Errors</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Log to the Event Log</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Mail forgotten password</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Manage Access Rules</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Manage Groups</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <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='list'>
+  <permission type='tuple'>
    <name>Manage Vocabulary</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Manage WebDAV Locks</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Manage Z Classes</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Manage ZCatalog Entries</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Manage ZCatalogIndex Entries</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
+   <name>Manage extensions</name>
+   <role>Manager</role>
+  </permission>
+  <permission type='tuple'>
    <name>Manage languages</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Manage messages</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Manage portal</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Manage properties</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Manage users</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Modify Cookie Crumblers</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Modify portal content</name>
+   <role>Assignor</role>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Open/Close Database Connection</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Open/Close Database Connections</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Post mail to ZMailIn</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Query Vocabulary</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Reply to item</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Request review</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Review portal content</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Save/discard Version changes</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Search ZCatalog</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Search for principals</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Set own password</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Set own properties</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Take ownership</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Test Database Connections</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Translate Content</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Undo changes</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Use Database Methods</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Use Factories</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Use mailhost services</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>View</name>
+   <role>Assignee</role>
+   <role>Assignor</role>
+   <role>Associate</role>
+   <role>Auditor</role>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>View History</name>
+   <role>Assignee</role>
+   <role>Assignor</role>
+   <role>Associate</role>
+   <role>Auditor</role>
+   <role>Author</role>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>View ZMailMessage</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>View management screens</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>WebDAV Lock items</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>WebDAV Unlock items</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>WebDAV access</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
-   <name>ZSyncer: Use ZSyncer</name>
-  </permission>
-  <permission type='list'>
-   <name>ZopeProfiler: manage</name>
-  </permission>
-  <permission type='list'>
-   <name>ZopeProfiler: view</name>
-  </permission>
  </permission_list>
  <portal_type>Apparel Size Module</portal_type>
  <title>Apparel Sizes</title>
diff --git a/bt5/erp5_apparel/ModuleTemplateItem/apparel_transformation_module.xml b/bt5/erp5_apparel/ModuleTemplateItem/apparel_transformation_module.xml
index adc93d725645738fccd16f1c2618c5c18603fc03..813fdbed8b77b5697372e1492b15eda02995c1b2 100644
--- a/bt5/erp5_apparel/ModuleTemplateItem/apparel_transformation_module.xml
+++ b/bt5/erp5_apparel/ModuleTemplateItem/apparel_transformation_module.xml
@@ -56,8 +56,9 @@
    <name>Add Browser Id Manager</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add CMF Action Icons Tools</name>
+   <role>Manager</role>
   </permission>
   <permission type='tuple'>
    <name>Add CMF Active Processs</name>
@@ -67,29 +68,33 @@
    <name>Add CMF Caching Policy Managers</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <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='list'>
+  <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='list'>
+  <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='list'>
+  <permission type='tuple'>
    <name>Add CMF Unique Id Tools</name>
+   <role>Manager</role>
   </permission>
   <permission type='tuple'>
    <name>Add CMFActivity Tools</name>
@@ -103,8 +108,9 @@
    <name>Add CMFMailIn Tools</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add Configured CMF Sites</name>
+   <role>Manager</role>
   </permission>
   <permission type='tuple'>
    <name>Add Content Type Registrys</name>
@@ -130,10 +136,11 @@
    <name>Add ERP5 Forms</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add ERP5 OOo Templates</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add ERP5 PDF Forms</name>
    <role>Manager</role>
   </permission>
@@ -169,8 +176,9 @@
    <name>Add ERP5Form Tools</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add ERP5Subversion Tools</name>
+   <role>Manager</role>
   </permission>
   <permission type='tuple'>
    <name>Add ERP5SyncML Tools</name>
@@ -225,26 +233,24 @@
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
-   <name>Add Page Templates</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add Photo Folders</name>
+   <name>Add MimetypesRegistry Tools</name>
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
-   <name>Add Photos</name>
+   <name>Add Page Templates</name>
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
    <name>Add Pluggable Index</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add Plugin Registrys</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
-   <name>Add Portal ZSyncer Tools</name>
+  <permission type='tuple'>
+   <name>Add PortalTransforms Tools</name>
+   <role>Manager</role>
   </permission>
   <permission type='tuple'>
    <name>Add Python Scripts</name>
@@ -278,10 +284,6 @@
    <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>
@@ -298,8 +300,9 @@
    <name>Add Z MySQL Database Connections</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
-   <name>Add Z MySQL Database Deferred Connections</name>
+  <permission type='tuple'>
+   <name>Add Z MySQL Deferred Database Connections</name>
+   <role>Manager</role>
   </permission>
   <permission type='tuple'>
    <name>Add ZCatalogs</name>
@@ -317,9 +320,6 @@
    <name>Add ZODB Mount Points</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
-   <name>Add ZSyncers</name>
-  </permission>
   <permission type='tuple'>
    <name>Add Zope Tutorials</name>
    <role>Manager</role>
@@ -336,6 +336,8 @@
   </permission>
   <permission type='tuple'>
    <name>Add portal folders</name>
+   <role>Assignor</role>
+   <role>Author</role>
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
@@ -394,10 +396,6 @@
    <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>
@@ -434,8 +432,10 @@
    <name>Change configuration</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Change local roles</name>
+   <role>Assignor</role>
+   <role>Manager</role>
   </permission>
   <permission type='tuple'>
    <name>Change permissions</name>
@@ -453,8 +453,17 @@
    <name>Change proxy roles</name>
    <role>Manager</role>
   </permission>
+  <permission type='tuple'>
+   <name>Change user folder</name>
+   <role>Manager</role>
+  </permission>
   <permission type='tuple'>
    <name>Copy or Move</name>
+   <role>Assignee</role>
+   <role>Assignor</role>
+   <role>Associate</role>
+   <role>Auditor</role>
+   <role>Author</role>
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
@@ -471,6 +480,7 @@
   </permission>
   <permission type='tuple'>
    <name>Delete objects</name>
+   <role>Assignor</role>
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
@@ -485,6 +495,10 @@
    <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>
@@ -530,8 +544,13 @@
    <name>Manage Access Rules</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <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>
@@ -557,6 +576,10 @@
    <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>
@@ -622,8 +645,9 @@
    <name>Search ZCatalog</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Search for principals</name>
+   <role>Manager</role>
   </permission>
   <permission type='tuple'>
    <name>Set own password</name>
@@ -667,7 +691,6 @@
    <role>Assignor</role>
    <role>Associate</role>
    <role>Auditor</role>
-   <role>Author</role>
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
@@ -699,15 +722,6 @@
    <name>WebDAV access</name>
    <role>Manager</role>
   </permission>
-  <permission type='list'>
-   <name>ZSyncer: Use ZSyncer</name>
-  </permission>
-  <permission type='list'>
-   <name>ZopeProfiler: manage</name>
-  </permission>
-  <permission type='list'>
-   <name>ZopeProfiler: view</name>
-  </permission>
  </permission_list>
  <portal_type>Apparel Transformation Module</portal_type>
  <title>Apparel Transformations</title>
diff --git a/bt5/erp5_apparel/bt/revision b/bt5/erp5_apparel/bt/revision
index 56a6051ca2b02b04ef92d5150c9ef600403cb1de..d8263ee9860594d2806b0dfd1bfd17528b0ba2a4 100644
--- a/bt5/erp5_apparel/bt/revision
+++ b/bt5/erp5_apparel/bt/revision
@@ -1 +1 @@
-1
\ No newline at end of file
+2
\ No newline at end of file