diff --git a/bt5/erp5_web/ModuleTemplateItem/web_page_module.xml b/bt5/erp5_web/ModuleTemplateItem/web_page_module.xml
index 7b65b1c8601970b99fefc835930ae241fe5ff43c..6eab35494caca0ce68b45c7fb1377a38c4d65ad2 100644
--- a/bt5/erp5_web/ModuleTemplateItem/web_page_module.xml
+++ b/bt5/erp5_web/ModuleTemplateItem/web_page_module.xml
@@ -1,522 +1,525 @@
 <module>
  <id>web_page_module</id>
  <permission_list>
-  <permission>
+  <permission type='list'>
    <name>Access Transient Objects</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Access arbitrary user session data</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Access contents information</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Access future portal content</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Access inactive portal content</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Access session data</name>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>AccessContentsInformation</name>
+  </permission>
+  <permission type='list'>
    <name>Add Accelerated HTTP Cache Managers</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add BTreeFolder2s</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Browser Id Manager</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add CMF Action Icons Tools</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add CMF Active Processs</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add CMF Caching Policy Managers</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add CMF Calendar Tools</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add CMF Core Tools</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add CMF Default Tools</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add CMF Report Tools</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add CMF Setup Tools</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add CMF Sites</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add CMF Unique Id Tools</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add CMFActivity Tools</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add CMFCategory Tools</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add CMFMailIn Tools</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Configured CMF Sites</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Content Type Registrys</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Cookie Crumblers</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Database Methods</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Documents, Images, and Files</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5 Filesystem Formulator Forms</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5 Forms</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5 OOo Templates</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5 PDF Forms</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5 PDF Templates</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5 Publications</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5 Reports</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5 Sites</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5 Subscriptions</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5 Tools</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5Catalog Tools</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5Form Tools</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5Subversion Tools</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5SyncML Tools</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5Type Tools</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ExtFiles</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ExtImages</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add External Methods</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Filesystem Directory Views</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Folders</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Formulator Forms</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add LocalContents</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add LocalFolders</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Localizers</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add MailHost objects</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add MessageCatalogs</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Page Templates</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Photo Folders</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Photos</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Pluggable Index</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Plugin Registrys</name>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Add Portal ZSyncer Tools</name>
+  </permission>
+  <permission type='list'>
    <name>Add Python Scripts</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add RAM Cache Managers</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ReStructuredText Documents</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Session Data Manager</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Site Roots</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Temporary Folder</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Transient Object Container</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add User Folders</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Versions</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Virtual Host Monsters</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Vocabularies</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Z Gadfly Database Connections</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Z MySQL Database Connections</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Z MySQL Database Deferred Connections</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ZCatalogs</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ZMailIn Clients</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ZMailMessages</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ZODB Mount Points</name>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Add ZSyncers</name>
+  </permission>
+  <permission type='list'>
    <name>Add Zope Tutorials</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add portal content</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add portal events</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add portal folders</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add portal member</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add portal topics</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change Browser Id Manager</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change DTML Documents</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change DTML Methods</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change Database Connections</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change Database Methods</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change ExtFile/ExtImage</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change External Methods</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change Formulator Fields</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change Formulator Forms</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change Images and Files</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change Lock Information</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change Page Templates</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change Photo</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change Python Scripts</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change Session Data Manager</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change Versions</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change ZMailIn</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change ZMailMessages</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change bindings</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change cache managers</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change cache settings</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change configuration</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change local roles</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change permissions</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change portal events</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change portal topics</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change proxy roles</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Copy or Move</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Create Transient Objects</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Create class instances</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Define permissions</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Delete objects</name>
   </permission>
-  <permission>
-   <name>DocFinder: add instance</name>
-  </permission>
-  <permission>
-   <name>DocFinder: document object</name>
-  </permission>
-  <permission>
-   <name>DocFinder: show code</name>
-  </permission>
-  <permission>
+  <permission type='list'>
    <name>Download ExtFile/ExtImage</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Edit Factories</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Edit ReStructuredText</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>FTP access</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Import/Export objects</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Join/leave Versions</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>List folder contents</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>List portal members</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>List undoable changes</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Log Site Errors</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Log to the Event Log</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Mail forgotten password</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Manage Access Rules</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Manage Groups</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Manage Transient Object Container</name>
   </permission>
-  <permission>
-   <name>Manage Translation Services</name>
-  </permission>
-  <permission>
+  <permission type='list'>
    <name>Manage Vocabulary</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Manage WebDAV Locks</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Manage Z Classes</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Manage ZCatalog Entries</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Manage ZCatalogIndex Entries</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Manage languages</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Manage messages</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Manage portal</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Manage properties</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Manage users</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Modify Cookie Crumblers</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Modify portal content</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Open/Close Database Connection</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Open/Close Database Connections</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Post mail to ZMailIn</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Query Vocabulary</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Reply to item</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Request review</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Review portal content</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Save/discard Version changes</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Search ZCatalog</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Search for principals</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Set own password</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Set own properties</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Take ownership</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Test Database Connections</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Translate Content</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Undo changes</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Use Database Methods</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Use Factories</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Use mailhost services</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>View</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>View History</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>View ZMailMessage</name>
   </permission>
-  <permission>
-   <name>View documentation</name>
-  </permission>
-  <permission>
+  <permission type='list'>
    <name>View management screens</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>WebDAV Lock items</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>WebDAV Unlock items</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <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>
+  </permission>
  </permission_list>
  <portal_type>Web Page Module</portal_type>
  <title>Web Pages</title>
diff --git a/bt5/erp5_web/ModuleTemplateItem/web_site_module.xml b/bt5/erp5_web/ModuleTemplateItem/web_site_module.xml
index 63c6a2a9d0b016b323e2023c9e5575d6fe95405f..8669879d323409d1af1a0fd647f2a48b747ebe41 100644
--- a/bt5/erp5_web/ModuleTemplateItem/web_site_module.xml
+++ b/bt5/erp5_web/ModuleTemplateItem/web_site_module.xml
@@ -1,522 +1,525 @@
 <module>
  <id>web_site_module</id>
  <permission_list>
-  <permission>
+  <permission type='list'>
    <name>Access Transient Objects</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Access arbitrary user session data</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Access contents information</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Access future portal content</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Access inactive portal content</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Access session data</name>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>AccessContentsInformation</name>
+  </permission>
+  <permission type='list'>
    <name>Add Accelerated HTTP Cache Managers</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add BTreeFolder2s</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Browser Id Manager</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add CMF Action Icons Tools</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add CMF Active Processs</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add CMF Caching Policy Managers</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add CMF Calendar Tools</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add CMF Core Tools</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add CMF Default Tools</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add CMF Report Tools</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add CMF Setup Tools</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add CMF Sites</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add CMF Unique Id Tools</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add CMFActivity Tools</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add CMFCategory Tools</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add CMFMailIn Tools</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Configured CMF Sites</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Content Type Registrys</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Cookie Crumblers</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Database Methods</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Documents, Images, and Files</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5 Filesystem Formulator Forms</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5 Forms</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5 OOo Templates</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5 PDF Forms</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5 PDF Templates</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5 Publications</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5 Reports</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5 Sites</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5 Subscriptions</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5 Tools</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5Catalog Tools</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5Form Tools</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5Subversion Tools</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5SyncML Tools</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5Type Tools</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ExtFiles</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ExtImages</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add External Methods</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Filesystem Directory Views</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Folders</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Formulator Forms</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add LocalContents</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add LocalFolders</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Localizers</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add MailHost objects</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add MessageCatalogs</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Page Templates</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Photo Folders</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Photos</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Pluggable Index</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Plugin Registrys</name>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Add Portal ZSyncer Tools</name>
+  </permission>
+  <permission type='list'>
    <name>Add Python Scripts</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add RAM Cache Managers</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ReStructuredText Documents</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Session Data Manager</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Site Roots</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Temporary Folder</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Transient Object Container</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add User Folders</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Versions</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Virtual Host Monsters</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Vocabularies</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Z Gadfly Database Connections</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Z MySQL Database Connections</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Z MySQL Database Deferred Connections</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ZCatalogs</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ZMailIn Clients</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ZMailMessages</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ZODB Mount Points</name>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Add ZSyncers</name>
+  </permission>
+  <permission type='list'>
    <name>Add Zope Tutorials</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add portal content</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add portal events</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add portal folders</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add portal member</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add portal topics</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change Browser Id Manager</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change DTML Documents</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change DTML Methods</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change Database Connections</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change Database Methods</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change ExtFile/ExtImage</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change External Methods</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change Formulator Fields</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change Formulator Forms</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change Images and Files</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change Lock Information</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change Page Templates</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change Photo</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change Python Scripts</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change Session Data Manager</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change Versions</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change ZMailIn</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change ZMailMessages</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change bindings</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change cache managers</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change cache settings</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change configuration</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change local roles</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change permissions</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change portal events</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change portal topics</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change proxy roles</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Copy or Move</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Create Transient Objects</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Create class instances</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Define permissions</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Delete objects</name>
   </permission>
-  <permission>
-   <name>DocFinder: add instance</name>
-  </permission>
-  <permission>
-   <name>DocFinder: document object</name>
-  </permission>
-  <permission>
-   <name>DocFinder: show code</name>
-  </permission>
-  <permission>
+  <permission type='list'>
    <name>Download ExtFile/ExtImage</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Edit Factories</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Edit ReStructuredText</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>FTP access</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Import/Export objects</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Join/leave Versions</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>List folder contents</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>List portal members</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>List undoable changes</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Log Site Errors</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Log to the Event Log</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Mail forgotten password</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Manage Access Rules</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Manage Groups</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Manage Transient Object Container</name>
   </permission>
-  <permission>
-   <name>Manage Translation Services</name>
-  </permission>
-  <permission>
+  <permission type='list'>
    <name>Manage Vocabulary</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Manage WebDAV Locks</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Manage Z Classes</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Manage ZCatalog Entries</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Manage ZCatalogIndex Entries</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Manage languages</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Manage messages</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Manage portal</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Manage properties</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Manage users</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Modify Cookie Crumblers</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Modify portal content</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Open/Close Database Connection</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Open/Close Database Connections</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Post mail to ZMailIn</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Query Vocabulary</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Reply to item</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Request review</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Review portal content</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Save/discard Version changes</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Search ZCatalog</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Search for principals</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Set own password</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Set own properties</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Take ownership</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Test Database Connections</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Translate Content</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Undo changes</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Use Database Methods</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Use Factories</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Use mailhost services</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>View</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>View History</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>View ZMailMessage</name>
   </permission>
-  <permission>
-   <name>View documentation</name>
-  </permission>
-  <permission>
+  <permission type='list'>
    <name>View management screens</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>WebDAV Lock items</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>WebDAV Unlock items</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <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>
+  </permission>
  </permission_list>
  <portal_type>Web Site Module</portal_type>
  <title>Web Sites</title>
diff --git a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebPage_view/my_description.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebPage_view/my_description.xml
index ba24e91747a4eda7f1b0d2b81d0b9f7a2308d742..c97f4d723c78b995214bc3024af97910296659ed 100644
--- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebPage_view/my_description.xml
+++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebPage_view/my_description.xml
@@ -219,7 +219,7 @@
                 </item>
                 <item>
                     <key> <string>description</string> </key>
-                    <value> <string>Short description that will appear in the search result list.</string> </value>
+                    <value> <string></string> </value>
                 </item>
                 <item>
                     <key> <string>editable</string> </key>
diff --git a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_getBreadcrumbValue.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_getBreadcrumbValue.xml
index 7e8ab13c37f48e5a2f7b3a023649dea220371935..e9cf33214d3883790a3cd2099f0d4e1b0aca9d93 100644
--- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_getBreadcrumbValue.xml
+++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_getBreadcrumbValue.xml
@@ -14,7 +14,9 @@
       <dictionary>
         <item>
             <key> <string>Python_magic</string> </key>
-            <value> <string encoding="base64">bfINCg==</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>Script_magic</string> </key>
@@ -89,7 +91,7 @@ return crumb_list\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5/portal_skins/erp5_web/WebSite_getBreadcrumbValue</string> </value>
+            <value> <string>Script (Python):/nexedi/portal_skins/erp5_web/WebSite_getBreadcrumbValue</string> </value>
         </item>
         <item>
             <key> <string>_owner</string> </key>
diff --git a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_getDefaultDocument.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_getDefaultDocument.xml
index 620ff3a04d223b59ac746d8b5237d966ac9432e5..b2643a6a55937e1bcf9ef5f497d0529f084a034c 100644
--- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_getDefaultDocument.xml
+++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_getDefaultDocument.xml
@@ -14,7 +14,9 @@
       <dictionary>
         <item>
             <key> <string>Python_magic</string> </key>
-            <value> <string encoding="base64">bfINCg==</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>Script_magic</string> </key>
@@ -77,7 +79,7 @@
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5/portal_skins/erp5_web/WebSite_getDefaultDocument</string> </value>
+            <value> <string>Script (Python):/nexedi/portal_skins/erp5_web/WebSite_getDefaultDocument</string> </value>
         </item>
         <item>
             <key> <string>_owner</string> </key>
diff --git a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_getDefaultDocumentValue.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_getDefaultDocumentValue.xml
index 2d1822613982fda68f1d6dd7334dc1061505c4e1..d0ac4bf9098410d69e263921a8b7f813bc598cc3 100644
--- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_getDefaultDocumentValue.xml
+++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_getDefaultDocumentValue.xml
@@ -14,7 +14,9 @@
       <dictionary>
         <item>
             <key> <string>Python_magic</string> </key>
-            <value> <string encoding="base64">bfINCg==</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>Script_magic</string> </key>
@@ -91,7 +93,7 @@ return None\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5/portal_skins/erp5_web/WebSite_getDefaultDocumentValue</string> </value>
+            <value> <string>Script (Python):/nexedi/portal_skins/erp5_web/WebSite_getDefaultDocumentValue</string> </value>
         </item>
         <item>
             <key> <string>_owner</string> </key>
diff --git a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_getDocument.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_getDocument.xml
index f2762c455208694220fab4c609d50c9801e3f745..276b6870b0922b526627b0e5a5314c54a985dc58 100644
--- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_getDocument.xml
+++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_getDocument.xml
@@ -14,7 +14,9 @@
       <dictionary>
         <item>
             <key> <string>Python_magic</string> </key>
-            <value> <string encoding="base64">bfINCg==</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>Script_magic</string> </key>
@@ -87,7 +89,7 @@ return None\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5/portal_skins/erp5_web/WebSite_getDocument</string> </value>
+            <value> <string>Script (Python):/nexedi/portal_skins/erp5_web/WebSite_getDocument</string> </value>
         </item>
         <item>
             <key> <string>_owner</string> </key>
diff --git a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_getDocumentPhysicalPath.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_getDocumentPhysicalPath.xml
index ef665f37fa43128bbfb8388358c941eab338b61f..a3b29d5a658e48ec53f801808d44ed05acc65c4b 100644
--- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_getDocumentPhysicalPath.xml
+++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_getDocumentPhysicalPath.xml
@@ -14,7 +14,9 @@
       <dictionary>
         <item>
             <key> <string>Python_magic</string> </key>
-            <value> <string encoding="base64">bfINCg==</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>Script_magic</string> </key>
@@ -83,7 +85,7 @@ return None\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5/portal_skins/erp5_web/WebSite_getDocumentPhysicalPath</string> </value>
+            <value> <string>Script (Python):/nexedi/portal_skins/erp5_web/WebSite_getDocumentPhysicalPath</string> </value>
         </item>
         <item>
             <key> <string>_owner</string> </key>
diff --git a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_getDocumentValue.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_getDocumentValue.xml
index 299450bc5e0d66922b1dcb4a79da7cc6837ff445..a9a30efe7c6a2d24600fac412a26371463d77407 100644
--- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_getDocumentValue.xml
+++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_getDocumentValue.xml
@@ -14,7 +14,9 @@
       <dictionary>
         <item>
             <key> <string>Python_magic</string> </key>
-            <value> <string encoding="base64">bfINCg==</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>Script_magic</string> </key>
@@ -82,7 +84,7 @@ return context\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5/portal_skins/erp5_web/WebSite_getDocumentValue</string> </value>
+            <value> <string>Script (Python):/nexedi/portal_skins/erp5_web/WebSite_getDocumentValue</string> </value>
         </item>
         <item>
             <key> <string>_owner</string> </key>
diff --git a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_getDocumentValueAsText.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_getDocumentValueAsText.xml
index f37e14e5c39f11cdcb8024bff94543a1fc02b16d..a8e6e5a45ac0025c4d10b908cec47b9a347532ed 100644
--- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_getDocumentValueAsText.xml
+++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_getDocumentValueAsText.xml
@@ -14,7 +14,9 @@
       <dictionary>
         <item>
             <key> <string>Python_magic</string> </key>
-            <value> <string encoding="base64">bfINCg==</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>Script_magic</string> </key>
@@ -77,7 +79,7 @@
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5/portal_skins/erp5_web/WebSite_getDocumentValueAsText</string> </value>
+            <value> <string>Script (Python):/nexedi/portal_skins/erp5_web/WebSite_getDocumentValueAsText</string> </value>
         </item>
         <item>
             <key> <string>_params</string> </key>
@@ -108,7 +110,7 @@
                         <value>
                           <tuple>
                             <string>_getattr_</string>
-                            <string>context</string>
+<string>context</string>
                           </tuple>
                         </value>
                     </item>
diff --git a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_getDocumentValueList.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_getDocumentValueList.xml
index 4f35a7d399be3d1d7a8acfc87d2dde8c1d90b6a3..0c305d5cf65704e4de484ccdf476c664c564ffa2 100644
--- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_getDocumentValueList.xml
+++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_getDocumentValueList.xml
@@ -14,7 +14,9 @@
       <dictionary>
         <item>
             <key> <string>Python_magic</string> </key>
-            <value> <string encoding="base64">bfINCg==</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>Script_magic</string> </key>
@@ -135,7 +137,7 @@ return brain_list\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5/portal_skins/erp5_web/WebSite_getDocumentValueList</string> </value>
+            <value> <string>Script (Python):/nexedi/portal_skins/erp5_web/WebSite_getDocumentValueList</string> </value>
         </item>
         <item>
             <key> <string>_params</string> </key>
diff --git a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_getMainSection.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_getMainSection.xml
index 5db5824916c06b69365e90d1a123bbfe2691e586..08e50eb5df13adc8750b37f766514b814d8b4be3 100644
--- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_getMainSection.xml
+++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_getMainSection.xml
@@ -14,7 +14,9 @@
       <dictionary>
         <item>
             <key> <string>Python_magic</string> </key>
-            <value> <string encoding="base64">bfINCg==</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>Script_magic</string> </key>
@@ -87,7 +89,7 @@ return previous_section\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5/portal_skins/erp5_web/WebSite_getMainSection</string> </value>
+            <value> <string>Script (Python):/nexedi/portal_skins/erp5_web/WebSite_getMainSection</string> </value>
         </item>
         <item>
             <key> <string>_params</string> </key>
diff --git a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_getMainSectionList.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_getMainSectionList.xml
index 3a7f3cf3bf5a350a142076a76022dd5cac720695..e0bd79ab14d2b0b8edd013b86d9d3408e610abc4 100644
--- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_getMainSectionList.xml
+++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_getMainSectionList.xml
@@ -14,7 +14,9 @@
       <dictionary>
         <item>
             <key> <string>Python_magic</string> </key>
-            <value> <string encoding="base64">bfINCg==</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>Script_magic</string> </key>
@@ -88,7 +90,7 @@ return filter(lambda x: x.isVisible(), section_list)\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5/portal_skins/erp5_web/WebSite_getMainSectionList</string> </value>
+            <value> <string>Script (Python):/nexedi/portal_skins/erp5_web/WebSite_getMainSectionList</string> </value>
         </item>
         <item>
             <key> <string>_params</string> </key>
diff --git a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_getSectionValue.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_getSectionValue.xml
index ade8cd8cdff13e2f59f89b13a38acdee88df677e..29ab8d867216be131fd3ce56572adc2cb1ef7910 100644
--- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_getSectionValue.xml
+++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_getSectionValue.xml
@@ -14,7 +14,9 @@
       <dictionary>
         <item>
             <key> <string>Python_magic</string> </key>
-            <value> <string encoding="base64">bfINCg==</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>Script_magic</string> </key>
@@ -81,7 +83,7 @@ return None\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5/portal_skins/erp5_web/WebSite_getSectionValue</string> </value>
+            <value> <string>Script (Python):/nexedi/portal_skins/erp5_web/WebSite_getSectionValue</string> </value>
         </item>
         <item>
             <key> <string>_owner</string> </key>
diff --git a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_getSite.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_getSite.xml
index 16fef6998ae85f12fe85da322afcf4f1febf3bbd..0d30ce1970b05dabdd94a494307a322ea6129af6 100644
--- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_getSite.xml
+++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_getSite.xml
@@ -14,7 +14,9 @@
       <dictionary>
         <item>
             <key> <string>Python_magic</string> </key>
-            <value> <string encoding="base64">bfINCg==</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>Script_magic</string> </key>
@@ -80,7 +82,7 @@ return None\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5/portal_skins/erp5_web/WebSite_getSite</string> </value>
+            <value> <string>Script (Python):/nexedi/portal_skins/erp5_web/WebSite_getSite</string> </value>
         </item>
         <item>
             <key> <string>_owner</string> </key>
diff --git a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_getSiteValue.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_getSiteValue.xml
index 64637dfbb6504dd21578bd5b5311675d64ee44e9..e1d3762882aa318ed8bf80cf891852ae256cb490 100644
--- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_getSiteValue.xml
+++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_getSiteValue.xml
@@ -14,7 +14,9 @@
       <dictionary>
         <item>
             <key> <string>Python_magic</string> </key>
-            <value> <string encoding="base64">bfINCg==</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>Script_magic</string> </key>
@@ -81,7 +83,7 @@ return None\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5/portal_skins/erp5_web/WebSite_getSiteValue</string> </value>
+            <value> <string>Script (Python):/nexedi/portal_skins/erp5_web/WebSite_getSiteValue</string> </value>
         </item>
         <item>
             <key> <string>_owner</string> </key>
diff --git a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_getUrl.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_getUrl.xml
index 0631f42ea5c524cf4a2b678bbe6dbecba3729b0f..25b21b9649817c380e8f66ecd4d0e1e1a253bb9d 100644
--- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_getUrl.xml
+++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_getUrl.xml
@@ -14,7 +14,9 @@
       <dictionary>
         <item>
             <key> <string>Python_magic</string> </key>
-            <value> <string encoding="base64">bfINCg==</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>Script_magic</string> </key>
@@ -95,7 +97,7 @@ return \'/\'.join(path_list)\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5/portal_skins/erp5_web/WebSite_getUrl</string> </value>
+            <value> <string>Script (Python):/nexedi/portal_skins/erp5_web/WebSite_getUrl</string> </value>
         </item>
         <item>
             <key> <string>_owner</string> </key>
diff --git a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_replaceActionUrl.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_replaceActionUrl.xml
index 5001d4a49129748711dde33536c16982ba904ab8..1d01b8e3a656d66dd2a5ddf582421045cc6460ff 100644
--- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_replaceActionUrl.xml
+++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_replaceActionUrl.xml
@@ -14,7 +14,9 @@
       <dictionary>
         <item>
             <key> <string>Python_magic</string> </key>
-            <value> <string encoding="base64">bfINCg==</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>Script_magic</string> </key>
@@ -84,7 +86,7 @@ return action\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5/portal_skins/erp5_web/WebSite_replaceActionUrl</string> </value>
+            <value> <string>Script (Python):/nexedi/portal_skins/erp5_web/WebSite_replaceActionUrl</string> </value>
         </item>
         <item>
             <key> <string>_owner</string> </key>