diff --git a/bt5/erp5_dms/ActionTemplateItem/portal_types/Image/file_upload.xml b/bt5/erp5_dms/ActionTemplateItem/portal_types/Image/file_upload.xml
index 2418c236d586e51457123c72ee9703dd20c479dd..e1be9ba0de8a33bc1f576714eb11897fcabc5a09 100644
--- a/bt5/erp5_dms/ActionTemplateItem/portal_types/Image/file_upload.xml
+++ b/bt5/erp5_dms/ActionTemplateItem/portal_types/Image/file_upload.xml
@@ -54,7 +54,7 @@
         </item>
         <item>
             <key> <string>priority</string> </key>
-            <value> <float>5.0</float> </value>
+            <value> <float>25.0</float> </value>
         </item>
         <item>
             <key> <string>title</string> </key>
diff --git a/bt5/erp5_dms/ActionTemplateItem/portal_types/Image/jump_to_similarity_cloud.xml b/bt5/erp5_dms/ActionTemplateItem/portal_types/Image/jump_to_similarity_cloud.xml
index 75182d36c4c72de69222dbf1d9115b95aa01a761..ac49728ce01be7b9af45d1edb568a28bd61b80aa 100644
--- a/bt5/erp5_dms/ActionTemplateItem/portal_types/Image/jump_to_similarity_cloud.xml
+++ b/bt5/erp5_dms/ActionTemplateItem/portal_types/Image/jump_to_similarity_cloud.xml
@@ -54,7 +54,7 @@
         </item>
         <item>
             <key> <string>priority</string> </key>
-            <value> <float>1.0</float> </value>
+            <value> <float>20.0</float> </value>
         </item>
         <item>
             <key> <string>title</string> </key>
diff --git a/bt5/erp5_dms/ActionTemplateItem/portal_types/Image/jump_to_wiki_predecessor.xml b/bt5/erp5_dms/ActionTemplateItem/portal_types/Image/jump_to_wiki_predecessor.xml
index 87a3cd28c0f5a127e4bbef30a5b55be6e4584d7e..5d924f0f8233bf1eecfb0c55da4a1848b6c7b543 100644
--- a/bt5/erp5_dms/ActionTemplateItem/portal_types/Image/jump_to_wiki_predecessor.xml
+++ b/bt5/erp5_dms/ActionTemplateItem/portal_types/Image/jump_to_wiki_predecessor.xml
@@ -54,7 +54,7 @@
         </item>
         <item>
             <key> <string>priority</string> </key>
-            <value> <float>10.0</float> </value>
+            <value> <float>30.0</float> </value>
         </item>
         <item>
             <key> <string>title</string> </key>
diff --git a/bt5/erp5_dms/ActionTemplateItem/portal_types/Image/view.xml b/bt5/erp5_dms/ActionTemplateItem/portal_types/Image/view.xml
index f53e1817de2831e7155bbcedd2baef8e1b602303..c42011eee3e0b061d2eac889677d94d515ef3dbb 100644
--- a/bt5/erp5_dms/ActionTemplateItem/portal_types/Image/view.xml
+++ b/bt5/erp5_dms/ActionTemplateItem/portal_types/Image/view.xml
@@ -81,7 +81,7 @@
       <dictionary>
         <item>
             <key> <string>text</string> </key>
-            <value> <string>string:${object_url}/File_view</string> </value>
+            <value> <string>string:${object_url}/Image_view</string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_dms/CategoryTemplateItem/portal_categories/classification.xml b/bt5/erp5_dms/CategoryTemplateItem/portal_categories/classification.xml
index 466cc477e350022eef264627d1cb4f64a26ad8d8..93959d9723fdd7cd8d2380a640d5fabeb1866cc9 100644
--- a/bt5/erp5_dms/CategoryTemplateItem/portal_categories/classification.xml
+++ b/bt5/erp5_dms/CategoryTemplateItem/portal_categories/classification.xml
@@ -88,7 +88,9 @@
         </item>
         <item>
             <key> <string>description</string> </key>
-            <value> <string></string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>fallback_base_category</string> </key>
diff --git a/bt5/erp5_dms/CategoryTemplateItem/portal_categories/publication_section.xml b/bt5/erp5_dms/CategoryTemplateItem/portal_categories/publication_section.xml
index c197f9139699743b12a72b99bdc5e10c087c9d59..c563c833671f58eede9ab5449de599f113837219 100644
--- a/bt5/erp5_dms/CategoryTemplateItem/portal_categories/publication_section.xml
+++ b/bt5/erp5_dms/CategoryTemplateItem/portal_categories/publication_section.xml
@@ -30,6 +30,12 @@
               <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
             </value>
         </item>
+        <item>
+            <key> <string>_owner</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>_tree</string> </key>
             <value>
diff --git a/bt5/erp5_dms/PortalTypeTemplateItem/portal_types/Drawing.xml b/bt5/erp5_dms/PortalTypeTemplateItem/portal_types/Drawing.xml
index 2ee5ec9b49d80e342e9aafc625884efc180ec701..9b6ce29abfeafcfbd1c4d3cc2459071165e3c265 100644
--- a/bt5/erp5_dms/PortalTypeTemplateItem/portal_types/Drawing.xml
+++ b/bt5/erp5_dms/PortalTypeTemplateItem/portal_types/Drawing.xml
@@ -83,6 +83,9 @@
             <value>
               <tuple>
                 <string>document</string>
+                <string>file_document</string>
+                <string>recent_document</string>
+                <string>my_document</string>
               </tuple>
             </value>
         </item>
diff --git a/bt5/erp5_dms/PortalTypeTemplateItem/portal_types/PDF.xml b/bt5/erp5_dms/PortalTypeTemplateItem/portal_types/PDF.xml
index bd3ad5bcbb29be6c37fd01b1cd853230f90b0c57..553b4926199fe67e7ebd55146437f00c2bff3e24 100644
--- a/bt5/erp5_dms/PortalTypeTemplateItem/portal_types/PDF.xml
+++ b/bt5/erp5_dms/PortalTypeTemplateItem/portal_types/PDF.xml
@@ -78,6 +78,9 @@
             <value>
               <tuple>
                 <string>document</string>
+                <string>file_document</string>
+                <string>recent_document</string>
+                <string>my_document</string>
               </tuple>
             </value>
         </item>
diff --git a/bt5/erp5_dms/PortalTypeTemplateItem/portal_types/Presentation.xml b/bt5/erp5_dms/PortalTypeTemplateItem/portal_types/Presentation.xml
index 8570e4f7fffe253b7a7c29c6a317976116960cd0..ab8139c4fd9eecb3095b0cde80eecd4ecc5f7f4d 100644
--- a/bt5/erp5_dms/PortalTypeTemplateItem/portal_types/Presentation.xml
+++ b/bt5/erp5_dms/PortalTypeTemplateItem/portal_types/Presentation.xml
@@ -89,6 +89,9 @@
             <value>
               <tuple>
                 <string>document</string>
+                <string>file_document</string>
+                <string>recent_document</string>
+                <string>my_document</string>
               </tuple>
             </value>
         </item>
diff --git a/bt5/erp5_dms/PortalTypeTemplateItem/portal_types/Spreadsheet.xml b/bt5/erp5_dms/PortalTypeTemplateItem/portal_types/Spreadsheet.xml
index cdd991f516fea7d2647c0ee5219c7a10d9ccafdc..0570030aa2b52597a89081143a7f9d57f6b57b4e 100644
--- a/bt5/erp5_dms/PortalTypeTemplateItem/portal_types/Spreadsheet.xml
+++ b/bt5/erp5_dms/PortalTypeTemplateItem/portal_types/Spreadsheet.xml
@@ -83,6 +83,9 @@
             <value>
               <tuple>
                 <string>document</string>
+                <string>file_document</string>
+                <string>recent_document</string>
+                <string>my_document</string>
               </tuple>
             </value>
         </item>
diff --git a/bt5/erp5_dms/PortalTypeTemplateItem/portal_types/Text.xml b/bt5/erp5_dms/PortalTypeTemplateItem/portal_types/Text.xml
index 5b673d02ff31f21d1776ae020fb6a8c56fe6ad9d..8b8dc65b86c371a236d66851cfe0e3e609df136f 100644
--- a/bt5/erp5_dms/PortalTypeTemplateItem/portal_types/Text.xml
+++ b/bt5/erp5_dms/PortalTypeTemplateItem/portal_types/Text.xml
@@ -83,6 +83,9 @@
             <value>
               <tuple>
                 <string>document</string>
+                <string>file_document</string>
+                <string>recent_document</string>
+                <string>my_document</string>
               </tuple>
             </value>
         </item>
diff --git a/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/document_interaction_workflow/scripts/updateLocalRoles.xml b/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/document_interaction_workflow/scripts/updateLocalRoles.xml
index ae63deb168912f586ebe425f244178a489236bcf..d1612c471fc8d1f8ec812cb025de1623c486a009 100644
--- a/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/document_interaction_workflow/scripts/updateLocalRoles.xml
+++ b/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/document_interaction_workflow/scripts/updateLocalRoles.xml
@@ -68,7 +68,7 @@
         </item>
         <item>
             <key> <string>_body</string> </key>
-            <value> <string>state_change.object.updateLocalRolesOnSecurityGroups()\n
+            <value> <string>state_change[\'object\'].updateLocalRolesOnSecurityGroups()\n
 </string> </value>
         </item>
         <item>
@@ -87,6 +87,14 @@
             <key> <string>_params</string> </key>
             <value> <string>state_change</string> </value>
         </item>
+        <item>
+            <key> <string>_proxy_roles</string> </key>
+            <value>
+              <tuple>
+                <string>Manager</string>
+              </tuple>
+            </value>
+        </item>
         <item>
             <key> <string>errors</string> </key>
             <value>
@@ -113,6 +121,7 @@
                           <tuple>
                             <string>state_change</string>
                             <string>_getattr_</string>
+                            <string>_getitem_</string>
                           </tuple>
                         </value>
                     </item>
diff --git a/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/document_publication_workflow.xml b/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/document_publication_workflow.xml
index eb0756af1741ad80ed0e394d095ba1b73ffe6b4c..e07aaf5fdde3cf3b997df7d80e8720b43bdb1276 100644
--- a/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/document_publication_workflow.xml
+++ b/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/document_publication_workflow.xml
@@ -67,7 +67,6 @@
                 <string>Add portal content</string>
                 <string>Modify portal content</string>
                 <string>Change local roles</string>
-                <string>Change Images and Files</string>
               </tuple>
             </value>
         </item>
diff --git a/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/document_publication_workflow/states/draft.xml b/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/document_publication_workflow/states/draft.xml
index 3f2fd1b8688791bad8047294eab7bc45ffdc348c..d605b3a6a421744cbad088d715b6e8e5a7db0be2 100644
--- a/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/document_publication_workflow/states/draft.xml
+++ b/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/document_publication_workflow/states/draft.xml
@@ -98,16 +98,9 @@
                     <key> <string>Add portal content</string> </key>
                     <value>
                       <tuple>
+                        <string>Assignee</string>
                         <string>Assignor</string>
                         <string>Manager</string>
-                      </tuple>
-                    </value>
-                </item>
-                <item>
-                    <key> <string>Change Images and Files</string> </key>
-                    <value>
-                      <tuple>
-                        <string>Assignee</string>
                         <string>Owner</string>
                       </tuple>
                     </value>
@@ -116,10 +109,8 @@
                     <key> <string>Change local roles</string> </key>
                     <value>
                       <tuple>
-                        <string>Assignee</string>
                         <string>Assignor</string>
                         <string>Manager</string>
-                        <string>Owner</string>
                       </tuple>
                     </value>
                 </item>
@@ -128,6 +119,7 @@
                     <value>
                       <tuple>
                         <string>Assignee</string>
+                        <string>Assignor</string>
                         <string>Manager</string>
                         <string>Owner</string>
                       </tuple>
diff --git a/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/document_publication_workflow/variables/portal_type.xml b/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/document_publication_workflow/variables/portal_type.xml
deleted file mode 100644
index 1781e6eb4ba73ec78f525b007da939ffd9b8a54d..0000000000000000000000000000000000000000
--- a/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/document_publication_workflow/variables/portal_type.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>VariableDefinition</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>portal_type</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/document_publication_workflow/worklists/docs_submitted_for_review.xml b/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/document_publication_workflow/worklists/submitted_for_review.xml
similarity index 73%
rename from bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/document_publication_workflow/worklists/docs_submitted_for_review.xml
rename to bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/document_publication_workflow/worklists/submitted_for_review.xml
index 837a6f4e41b752477be19f3f1e1f90524083bf5f..b6a1eabd80811c96cdbc581ff3f76d269350a835 100644
--- a/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/document_publication_workflow/worklists/docs_submitted_for_review.xml
+++ b/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/document_publication_workflow/worklists/submitted_for_review.xml
@@ -30,19 +30,19 @@
         </item>
         <item>
             <key> <string>actbox_name</string> </key>
-            <value> <string>Documents for review (%(count)s)</string> </value>
+            <value> <string>Documents submitted for review (%(count)s)</string> </value>
         </item>
         <item>
             <key> <string>actbox_url</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
-document_module?simulation_state=submitted&local_roles=%(local_roles)s&reset=1&portal_type=Text&portal_type=Spreadsheet&portal_type=Presentation&portal_type=Drawing&portal_type=PDF&portal_type=File&portal_type=Image
+WebSite_viewAdvancedSearchResultList?validation_state=submitted&local_roles=%(local_roles)s&portal_type=%(portal_type)s&reset=1
 
 ]]></string> </value>
         </item>
         <item>
             <key> <string>description</string> </key>
-            <value> <string></string> </value>
+            <value> <string>Documents submitted for review</string> </value>
         </item>
         <item>
             <key> <string>guard</string> </key>
@@ -52,7 +52,7 @@ document_module?simulation_state=submitted&local_roles=%(local_roles)s&reset=1&p
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>docs_submitted_for_review</string> </value>
+            <value> <string>submitted_for_review</string> </value>
         </item>
         <item>
             <key> <string>var_matches</string> </key>
@@ -103,21 +103,7 @@ document_module?simulation_state=submitted&local_roles=%(local_roles)s&reset=1&p
             <value>
               <dictionary>
                 <item>
-                    <key> <string>portal_type</string> </key>
-                    <value>
-                      <tuple>
-                        <string>Text</string>
-                        <string>Spreadsheet</string>
-                        <string>Presentation</string>
-                        <string>Drawing</string>
-                        <string>PDF</string>
-                        <string>File</string>
-                        <string>Image</string>
-                      </tuple>
-                    </value>
-                </item>
-                <item>
-                    <key> <string>simulation_state</string> </key>
+                    <key> <string>validation_state</string> </key>
                     <value>
                       <tuple>
                         <string>submitted</string>
diff --git a/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/local_permission_interaction_workflow/interactions/DocumentAssignRoles.xml b/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/local_permission_interaction_workflow/interactions/DocumentAssignRoles.xml
index 0f26e42b7fcc971da366360649132c6da1ed6aba..48e3cdaeab3a82306f97e3930a27e3eb6a90743c 100644
--- a/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/local_permission_interaction_workflow/interactions/DocumentAssignRoles.xml
+++ b/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/local_permission_interaction_workflow/interactions/DocumentAssignRoles.xml
@@ -71,10 +71,16 @@
             <key> <string>portal_type_filter</string> </key>
             <value>
               <list>
+                <string>Drawing</string>
+                <string>File</string>
+                <string>Image</string>
+                <string>Organisation</string>
+                <string>PDF</string>
                 <string>Person</string>
                 <string>Presentation</string>
                 <string>Spreadsheet</string>
                 <string>Text</string>
+                <string>Web Page</string>
               </list>
             </value>
         </item>
diff --git a/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/local_permission_interaction_workflow/scripts/Document_assignRoleToGroup.xml b/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/local_permission_interaction_workflow/scripts/Document_assignRoleToGroup.xml
index 85dbe9523ed6a80e76772b0a8d0a6594b52fccff..c0627edfbdfd50543f0a1c7b404fc24f4d59f48a 100644
--- a/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/local_permission_interaction_workflow/scripts/Document_assignRoleToGroup.xml
+++ b/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/local_permission_interaction_workflow/scripts/Document_assignRoleToGroup.xml
@@ -68,9 +68,13 @@
         </item>
         <item>
             <key> <string>_body</string> </key>
-            <value> <string>ob = sci[\'object\']\n
+            <value> <string>"""\n
+This script updates the local roles on the document.\n
+It is called usually called after each update on\n
+a document which follows classification based security.\n
+"""\n
+ob = sci[\'object\']\n
 ob.assignRoleToSecurityGroup()\n
-ob.log(\'assigned\')\n
 </string> </value>
         </item>
         <item>
diff --git a/bt5/erp5_dms/bt/revision b/bt5/erp5_dms/bt/revision
index 245d3cfbf3463ec8a74679701ecdfb1ee0e0682b..23c5f49dce2fe2fe524cf1f2e227fe5b42560b10 100644
--- a/bt5/erp5_dms/bt/revision
+++ b/bt5/erp5_dms/bt/revision
@@ -1 +1 @@
-561
\ No newline at end of file
+572
\ No newline at end of file
diff --git a/bt5/erp5_dms/bt/template_catalog_method_id_list b/bt5/erp5_dms/bt/template_catalog_method_id_list
index 120cc3babba5cdb990e3cfeb3d2e12f13982d8e0..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
--- a/bt5/erp5_dms/bt/template_catalog_method_id_list
+++ b/bt5/erp5_dms/bt/template_catalog_method_id_list
@@ -1,6 +0,0 @@
-erp5_mysql/z0_drop_email
-erp5_mysql/z0_uncatalog_email
-erp5_mysql/z_catalog_compatibility_list
-erp5_mysql/z_catalog_email_list
-erp5_mysql/z_create_compatibility
-erp5_mysql/z_create_email
\ No newline at end of file
diff --git a/bt5/erp5_dms/bt/template_catalog_result_table_list b/bt5/erp5_dms/bt/template_catalog_result_table_list
index ca10352b39bed5c9f140d58f5a63540e3fed8ca9..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
--- a/bt5/erp5_dms/bt/template_catalog_result_table_list
+++ b/bt5/erp5_dms/bt/template_catalog_result_table_list
@@ -1,2 +0,0 @@
-compatibility
-email
\ No newline at end of file
diff --git a/bt5/erp5_dms/bt/template_path_list b/bt5/erp5_dms/bt/template_path_list
index b36fedbf2be03137cc62cee07bc274fae16aa38b..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
--- a/bt5/erp5_dms/bt/template_path_list
+++ b/bt5/erp5_dms/bt/template_path_list
@@ -1,3 +0,0 @@
-portal_categories/function/knowledge
-portal_categories/function/knowledge/contributor
-portal_categories/function/knowledge/manager
\ No newline at end of file
diff --git a/bt5/erp5_dms/bt/template_portal_type_workflow_chain_list b/bt5/erp5_dms/bt/template_portal_type_workflow_chain_list
index 77a66810950c013e50549e8ade07cca0509ff7e6..fa4c20f3df9e980991e498be0d8f30bd6874d40b 100644
--- a/bt5/erp5_dms/bt/template_portal_type_workflow_chain_list
+++ b/bt5/erp5_dms/bt/template_portal_type_workflow_chain_list
@@ -32,4 +32,4 @@ Spreadsheet | processing_status_workflow
 Text | document_interaction_workflow
 Text | document_publication_workflow
 Text | local_permission_interaction_workflow
-Text | processing_status_workflow
+Text | processing_status_workflow
\ No newline at end of file