diff --git a/bt5/erp5_base/ModuleTemplateItem/currency_module.xml b/bt5/erp5_base/ModuleTemplateItem/currency_module.xml
index a378a99bf36aa7dd2f64926ead4a6bba7f3cc392..76ae1164d5ee407aabb3dcd3c45c7cbc1115d0f5 100644
--- a/bt5/erp5_base/ModuleTemplateItem/currency_module.xml
+++ b/bt5/erp5_base/ModuleTemplateItem/currency_module.xml
@@ -236,14 +236,6 @@
    <name>Add Page Templates</name>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Add Photo Folders</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add Photos</name>
-   <role>Manager</role>
-  </permission>
   <permission type='tuple'>
    <name>Add Pluggable Index</name>
    <role>Manager</role>
@@ -288,10 +280,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>
@@ -404,10 +392,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>
@@ -465,6 +449,10 @@
    <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>
@@ -556,6 +544,10 @@
    <name>Manage Groups</name>
    <role>Manager</role>
   </permission>
+  <permission type='tuple'>
+   <name>Manage Selenium test cases</name>
+   <role>Manager</role>
+  </permission>
   <permission type='tuple'>
    <name>Manage Transient Object Container</name>
    <role>Manager</role>
@@ -580,6 +572,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>
@@ -691,7 +687,6 @@
    <role>Assignor</role>
    <role>Associate</role>
    <role>Auditor</role>
-   <role>Author</role>
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
diff --git a/bt5/erp5_base/ModuleTemplateItem/organisation_module.xml b/bt5/erp5_base/ModuleTemplateItem/organisation_module.xml
index d0af36f3633a4fa61c7039a3e96a3a3e022eba90..633d8f814ab82c5acedd5770307c9c5641196a49 100644
--- a/bt5/erp5_base/ModuleTemplateItem/organisation_module.xml
+++ b/bt5/erp5_base/ModuleTemplateItem/organisation_module.xml
@@ -116,14 +116,6 @@
    <name>Add Cookie Crumblers</name>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Add DCOracle2 Database Connections</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add DCOracle2 Stored Procedures</name>
-   <role>Manager</role>
-  </permission>
   <permission type='tuple'>
    <name>Add Database Methods</name>
    <role>Manager</role>
@@ -244,14 +236,6 @@
    <name>Add Page Templates</name>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Add Photo Folders</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add Photos</name>
-   <role>Manager</role>
-  </permission>
   <permission type='tuple'>
    <name>Add Pluggable Index</name>
    <role>Manager</role>
@@ -296,10 +280,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>
@@ -368,10 +348,6 @@
    <name>Change Browser Id Manager</name>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Change DCOracle2 Stored Procedures</name>
-   <role>Manager</role>
-  </permission>
   <permission type='tuple'>
    <name>Change DTML Documents</name>
    <role>Manager</role>
@@ -416,10 +392,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>
@@ -477,8 +449,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'>
@@ -514,10 +495,6 @@
    <name>Edit target</name>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Execute DCOracle2 Stored Procedures</name>
-   <role>Manager</role>
-  </permission>
   <permission type='tuple'>
    <name>FTP access</name>
    <role>Manager</role>
@@ -700,10 +677,6 @@
    <name>Use Factories</name>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Use external editor</name>
-   <role>Manager</role>
-  </permission>
   <permission type='tuple'>
    <name>Use mailhost services</name>
    <role>Manager</role>
@@ -714,7 +687,6 @@
    <role>Assignor</role>
    <role>Associate</role>
    <role>Auditor</role>
-   <role>Author</role>
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
diff --git a/bt5/erp5_base/ModuleTemplateItem/person_module.xml b/bt5/erp5_base/ModuleTemplateItem/person_module.xml
index ddae9fa936e186bf8ab6e35a77bb300fd899ac59..47bc5ed0fdac37cced6d8b06e5f4fcfa59ca47c7 100644
--- a/bt5/erp5_base/ModuleTemplateItem/person_module.xml
+++ b/bt5/erp5_base/ModuleTemplateItem/person_module.xml
@@ -116,14 +116,6 @@
    <name>Add Cookie Crumblers</name>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Add DCOracle2 Database Connections</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add DCOracle2 Stored Procedures</name>
-   <role>Manager</role>
-  </permission>
   <permission type='tuple'>
    <name>Add Database Methods</name>
    <role>Manager</role>
@@ -244,14 +236,6 @@
    <name>Add Page Templates</name>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Add Photo Folders</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add Photos</name>
-   <role>Manager</role>
-  </permission>
   <permission type='tuple'>
    <name>Add Pluggable Index</name>
    <role>Manager</role>
@@ -296,10 +280,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>
@@ -368,10 +348,6 @@
    <name>Change Browser Id Manager</name>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Change DCOracle2 Stored Procedures</name>
-   <role>Manager</role>
-  </permission>
   <permission type='tuple'>
    <name>Change DTML Documents</name>
    <role>Manager</role>
@@ -416,10 +392,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>
@@ -477,8 +449,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'>
@@ -514,10 +495,6 @@
    <name>Edit target</name>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Execute DCOracle2 Stored Procedures</name>
-   <role>Manager</role>
-  </permission>
   <permission type='tuple'>
    <name>FTP access</name>
    <role>Manager</role>
@@ -700,10 +677,6 @@
    <name>Use Factories</name>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Use external editor</name>
-   <role>Manager</role>
-  </permission>
   <permission type='tuple'>
    <name>Use mailhost services</name>
    <role>Manager</role>
@@ -714,7 +687,6 @@
    <role>Assignor</role>
    <role>Associate</role>
    <role>Auditor</role>
-   <role>Author</role>
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
diff --git a/bt5/erp5_base/ModuleTemplateItem/query_module.xml b/bt5/erp5_base/ModuleTemplateItem/query_module.xml
index 1b7ba3634e776f7d4299cfae734955bdec328aa0..5545d8b4857048b0c5f0a224bc6b81cf52b1db1f 100644
--- a/bt5/erp5_base/ModuleTemplateItem/query_module.xml
+++ b/bt5/erp5_base/ModuleTemplateItem/query_module.xml
@@ -64,6 +64,10 @@
    <name>Add CMF Caching Policy Managers</name>
    <role>Manager</role>
   </permission>
+  <permission type='tuple'>
+   <name>Add CMF Calendar Tools</name>
+   <role>Manager</role>
+  </permission>
   <permission type='tuple'>
    <name>Add CMF Core Tools</name>
    <role>Manager</role>
@@ -73,17 +77,21 @@
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
-   <name>Add CMF Groups Tools</name>
+   <name>Add CMF Report Tools</name>
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
-   <name>Add CMF Report Tools</name>
+   <name>Add CMF Setup Tools</name>
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
    <name>Add CMF Sites</name>
    <role>Manager</role>
   </permission>
+  <permission type='tuple'>
+   <name>Add CMF Unique Id Tools</name>
+   <role>Manager</role>
+  </permission>
   <permission type='tuple'>
    <name>Add CMFActivity Tools</name>
    <role>Manager</role>
@@ -96,6 +104,10 @@
    <name>Add CMFMailIn Tools</name>
    <role>Manager</role>
   </permission>
+  <permission type='tuple'>
+   <name>Add Configured CMF Sites</name>
+   <role>Manager</role>
+  </permission>
   <permission type='tuple'>
    <name>Add Content Type Registrys</name>
    <role>Manager</role>
@@ -196,18 +208,6 @@
    <name>Add Formulator Forms</name>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Add GroupUserFolder</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add GroupUserFolders</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add Groups</name>
-   <role>Manager</role>
-  </permission>
   <permission type='tuple'>
    <name>Add LocalContents</name>
    <role>Manager</role>
@@ -236,14 +236,6 @@
    <name>Add Page Templates</name>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Add Photo Folders</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add Photos</name>
-   <role>Manager</role>
-  </permission>
   <permission type='tuple'>
    <name>Add Pluggable Index</name>
    <role>Manager</role>
@@ -288,10 +280,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>
@@ -338,6 +326,10 @@
    <role>Author</role>
    <role>Manager</role>
   </permission>
+  <permission type='tuple'>
+   <name>Add portal events</name>
+   <role>Manager</role>
+  </permission>
   <permission type='tuple'>
    <name>Add portal folders</name>
    <role>Assignor</role>
@@ -352,10 +344,6 @@
    <name>Add portal topics</name>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Add secure MailHost objects</name>
-   <role>Manager</role>
-  </permission>
   <permission type='tuple'>
    <name>Change Browser Id Manager</name>
    <role>Manager</role>
@@ -404,10 +392,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>
@@ -453,6 +437,10 @@
    <name>Change permissions</name>
    <role>Manager</role>
   </permission>
+  <permission type='tuple'>
+   <name>Change portal events</name>
+   <role>Manager</role>
+  </permission>
   <permission type='tuple'>
    <name>Change portal topics</name>
    <role>Manager</role>
@@ -461,8 +449,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'>
@@ -477,10 +474,6 @@
    <name>Define permissions</name>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Delete Groups</name>
-   <role>Manager</role>
-  </permission>
   <permission type='tuple'>
    <name>Delete objects</name>
    <role>Assignor</role>
@@ -652,10 +645,6 @@
    <name>Search for principals</name>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Set Group Ownership</name>
-   <role>Manager</role>
-  </permission>
   <permission type='tuple'>
    <name>Set own password</name>
    <role>Manager</role>
@@ -688,10 +677,6 @@
    <name>Use Factories</name>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Use external editor</name>
-   <role>Manager</role>
-  </permission>
   <permission type='tuple'>
    <name>Use mailhost services</name>
    <role>Manager</role>
@@ -702,11 +687,6 @@
    <role>Assignor</role>
    <role>Associate</role>
    <role>Auditor</role>
-   <role>Author</role>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>View Groups</name>
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
diff --git a/bt5/erp5_base/bt/revision b/bt5/erp5_base/bt/revision
index 4e66132b50032ef4b80cd41c36efeb2353360c8c..9e6181a6edf278d8fe3d626196e7a67223fae140 100644
--- a/bt5/erp5_base/bt/revision
+++ b/bt5/erp5_base/bt/revision
@@ -1 +1 @@
-282
\ No newline at end of file
+285
\ No newline at end of file