diff --git a/bt5/nexedi_vpn/ModuleTemplateItem/vpn.xml b/bt5/nexedi_vpn/ModuleTemplateItem/vpn.xml
index 1003bcfa66048385479e8e174a844d6a22994ccc..40682910be68e0e4ca6b8803007d6fbed133b9ab 100644
--- a/bt5/nexedi_vpn/ModuleTemplateItem/vpn.xml
+++ b/bt5/nexedi_vpn/ModuleTemplateItem/vpn.xml
@@ -1,707 +1,676 @@
 <module>
  <id>vpn</id>
  <permission_list>
-  <permission>
+  <permission type='list'>
    <name>Access Transient Objects</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Access arbitrary user session data</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Access contents information</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Access future portal content</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Access inactive portal content</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Access session data</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>AccessContentsInformation</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Accelerated HTTP Cache Managers</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add BTreeFolder2s</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Add Base18 Tools</name>
-   <role>Manager</role>
-  </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Browser Id Manager</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Add CMF Action Icons Tools</name>
+  </permission>
+  <permission type='list'>
    <name>Add CMF Active Processs</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add CMF Caching Policy Managers</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Add CMF Calendar Tools</name>
+  </permission>
+  <permission type='list'>
    <name>Add CMF Core Tools</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Add CMF Default Tools</name>
+  </permission>
+  <permission type='list'>
    <name>Add CMF Report Tools</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Add CMF Setup Tools</name>
+  </permission>
+  <permission type='list'>
    <name>Add CMF Sites</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Add CMFActivity Tools</name>
-   <role>Manager</role>
+  <permission type='list'>
+   <name>Add CMF Unique Id Tools</name>
   </permission>
-  <permission>
-   <name>Add CMFCalendar Tools</name>
+  <permission type='list'>
+   <name>Add CMFActivity Tools</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add CMFCategory Tools</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Add CMFDefault Tools</name>
-   <role>Manager</role>
-  </permission>
-  <permission>
+  <permission type='list'>
    <name>Add CMFMailIn Tools</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Add CMFWiki Comment</name>
-   <role>Manager</role>
+  <permission type='list'>
+   <name>Add Configured CMF Sites</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Content Type Registrys</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Cookie Crumblers</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Database Methods</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Documents, Images, and Files</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5 Filesystem Formulator Forms</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5 Forms</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Add ERP5 OOo Templates</name>
+  </permission>
+  <permission type='list'>
    <name>Add ERP5 PDF Forms</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5 PDF Templates</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5 Publications</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5 Reports</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5 Sites</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5 Subscriptions</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5 Tools</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5Catalog Tools</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5Form Tools</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Add ERP5Shop Tools</name>
-   <role>Manager</role>
+  <permission type='list'>
+   <name>Add ERP5Subversion Tools</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5SyncML Tools</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ERP5Type Tools</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ExtFiles</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ExtImages</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add External Methods</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Filesystem Directory Views</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Folders</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Formulator Forms</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add LocalContents</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add LocalFolders</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Localizers</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Add MMM Shop Toolss</name>
-   <role>Manager</role>
-  </permission>
-  <permission>
+  <permission type='list'>
    <name>Add MailHost objects</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add MessageCatalogs</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Page Templates</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Photo Folders</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Photos</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Pluggable Index</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Add Plugin Registrys</name>
+  </permission>
+  <permission type='list'>
+   <name>Add Portal ZSyncer Tools</name>
+  </permission>
+  <permission type='list'>
    <name>Add Python Scripts</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add RAM Cache Managers</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ReStructuredText Documents</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Session Data Manager</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Site Roots</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Temporary Folder</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Transient Object Container</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add User Folders</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Versions</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Virtual Host Monsters</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Vocabularies</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Z Gadfly Database Connections</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add Z MySQL Database Connections</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Add Z MySQL Database Deferred Connections</name>
+  </permission>
+  <permission type='list'>
    <name>Add ZCatalogs</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ZMailIn Clients</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ZMailMessages</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add ZODB Mount Points</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Add ZSyncers</name>
+  </permission>
+  <permission type='list'>
    <name>Add Zope Tutorials</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add portal content</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add portal events</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add portal folders</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add portal member</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Add portal topics</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Add shop category</name>
-   <role>Manager</role>
-  </permission>
-  <permission>
+  <permission type='list'>
    <name>Change Browser Id Manager</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Change CMFWiki Regulations</name>
-   <role>Manager</role>
-  </permission>
-  <permission>
+  <permission type='list'>
    <name>Change DTML Documents</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change DTML Methods</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change Database Connections</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change Database Methods</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change ExtFile/ExtImage</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change External Methods</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change Formulator Fields</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change Formulator Forms</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change Images and Files</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change Lock Information</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change Page Templates</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change Photo</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change Python Scripts</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change Session Data Manager</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change Versions</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change ZMailIn</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change ZMailMessages</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change bindings</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change cache managers</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change cache settings</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change configuration</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Change local roles</name>
+  </permission>
+  <permission type='list'>
    <name>Change permissions</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change portal events</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change portal topics</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Change proxy roles</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Checkout shopping cart</name>
-   <role>Manager</role>
-  </permission>
-  <permission>
+  <permission type='list'>
    <name>Copy or Move</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Create CMFWiki Page</name>
-   <role>Manager</role>
-  </permission>
-  <permission>
+  <permission type='list'>
    <name>Create Transient Objects</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Create class instances</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Define permissions</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Delete objects</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Download ExtFile/ExtImage</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Download Product</name>
-   <role>Manager</role>
-  </permission>
-  <permission>
-   <name>Edit CMFWiki Page</name>
-   <role>Manager</role>
-  </permission>
-  <permission>
+  <permission type='list'>
    <name>Edit Factories</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Edit ReStructuredText</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>FTP access</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Import/Export objects</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Join/leave Versions</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>List folder contents</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>List portal members</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>List undoable changes</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Log Site Errors</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Log to the Event Log</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Mail forgotten password</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Manage Access Rules</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Manage Transient Object Container</name>
-   <role>Manager</role>
+  <permission type='list'>
+   <name>Manage Groups</name>
   </permission>
-  <permission>
-   <name>Manage Translation Services</name>
+  <permission type='list'>
+   <name>Manage Transient Object Container</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Manage Vocabulary</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Manage WebDAV Locks</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Manage Z Classes</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Manage ZCatalog Entries</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Manage ZCatalogIndex Entries</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Manage currencies</name>
-   <role>Manager</role>
-  </permission>
-  <permission>
-   <name>Manage extensions</name>
-  </permission>
-  <permission>
+  <permission type='list'>
    <name>Manage languages</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Manage messages</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Manage portal</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Manage properties</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Manage shop</name>
-   <role>Manager</role>
-  </permission>
-  <permission>
-   <name>Manage shop catalog</name>
-   <role>Manager</role>
-  </permission>
-  <permission>
-   <name>Manage shop category</name>
-   <role>Manager</role>
-  </permission>
-  <permission>
+  <permission type='list'>
    <name>Manage users</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Manage_messages</name>
-   <role>Manager</role>
-  </permission>
-  <permission>
+  <permission type='list'>
    <name>Modify Cookie Crumblers</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Modify portal content</name>
    <role>Manager</role>
   </permission>
-  <permission>
-   <name>Move CMFWiki Page</name>
-   <role>Manager</role>
-  </permission>
-  <permission>
+  <permission type='list'>
    <name>Open/Close Database Connection</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Open/Close Database Connections</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Post mail to ZMailIn</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Query Vocabulary</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Reply to item</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Request review</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Review portal content</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Save/discard Version changes</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Search ZCatalog</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>Search for principals</name>
+  </permission>
+  <permission type='list'>
    <name>Set own password</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Set own properties</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Take ownership</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Test Database Connections</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Translate Content</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Undo changes</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Use Database Methods</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Use Factories</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>Use mailhost services</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>View</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>View History</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>View ZMailMessage</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>View management screens</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>WebDAV Lock items</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>WebDAV Unlock items</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>WebDAV access</name>
    <role>Manager</role>
   </permission>
-  <permission>
+  <permission type='list'>
+   <name>ZSyncer: Use ZSyncer</name>
+  </permission>
+  <permission type='list'>
    <name>ZopeProfiler: manage</name>
   </permission>
-  <permission>
+  <permission type='list'>
    <name>ZopeProfiler: view</name>
   </permission>
  </permission_list>
diff --git a/bt5/nexedi_vpn/PortalTypeTemplateItem/portal_types/Nexedi%20VPN%20Module.xml b/bt5/nexedi_vpn/PortalTypeTemplateItem/portal_types/Nexedi%20VPN%20Module.xml
index a87cbb0aed241cef883eb8747814614f7400198f..885b22397a21237060467ea20ab6d282e5404d67 100644
--- a/bt5/nexedi_vpn/PortalTypeTemplateItem/portal_types/Nexedi%20VPN%20Module.xml
+++ b/bt5/nexedi_vpn/PortalTypeTemplateItem/portal_types/Nexedi%20VPN%20Module.xml
@@ -21,668 +21,79 @@
         <item>
             <key> <string>_actions</string> </key>
             <value>
-              <tuple>
-                <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
-                <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
-                <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
-                <persistent> <string encoding="base64">AAAAAAAAAAU=</string> </persistent>
-                <persistent> <string encoding="base64">AAAAAAAAAAY=</string> </persistent>
-                <persistent> <string encoding="base64">AAAAAAAAAAc=</string> </persistent>
-                <persistent> <string encoding="base64">AAAAAAAAAAg=</string> </persistent>
-                <persistent> <string encoding="base64">AAAAAAAAAAk=</string> </persistent>
-              </tuple>
+              <tuple/>
             </value>
         </item>
         <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>allowed_content_types</string> </key>
-            <value>
-              <tuple>
-                <string>Nexedi VPN</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>content_icon</string> </key>
-            <value> <string>folder_icon.gif</string> </value>
-        </item>
-        <item>
-            <key> <string>content_meta_type</string> </key>
-            <value> <string>ERP5 Folder</string> </value>
-        </item>
-        <item>
-            <key> <string>description</string> </key>
-            <value> <string>Folders allow to store a large number of documents (1,000,000 should not\n
-be a problem).</string> </value>
-        </item>
-        <item>
-            <key> <string>factory</string> </key>
-            <value> <string>addFolder</string> </value>
-        </item>
-        <item>
-            <key> <string>filter_content_types</string> </key>
-            <value> <int>1</int> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>Nexedi VPN Module</string> </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>Nexedi VPN</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-  <record id="2" aka="AAAAAAAAAAI=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>action</string> </key>
-            <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAo=</string> </persistent>
-            </value>
-        </item>
-        <item>
-            <key> <string>category</string> </key>
-            <value> <string>object_view</string> </value>
-        </item>
-        <item>
-            <key> <string>condition</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>description</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>view</string> </value>
-        </item>
-        <item>
-            <key> <string>permissions</string> </key>
-            <value>
-              <tuple>
-                <string>View</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>priority</string> </key>
-            <value> <int>10</int> </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>View</string> </value>
-        </item>
-        <item>
-            <key> <string>visible</string> </key>
-            <value> <int>1</int> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-  <record id="3" aka="AAAAAAAAAAM=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>action</string> </key>
-            <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAs=</string> </persistent>
-            </value>
-        </item>
-        <item>
-            <key> <string>category</string> </key>
-            <value> <string>object</string> </value>
-        </item>
-        <item>
-            <key> <string>condition</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>description</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>list</string> </value>
-        </item>
-        <item>
-            <key> <string>permissions</string> </key>
-            <value>
-              <tuple>
-                <string>View</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>priority</string> </key>
-            <value> <int>10</int> </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>List</string> </value>
-        </item>
-        <item>
-            <key> <string>visible</string> </key>
-            <value> <int>1</int> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-  <record id="4" aka="AAAAAAAAAAQ=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>action</string> </key>
-            <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAw=</string> </persistent>
-            </value>
-        </item>
-        <item>
-            <key> <string>category</string> </key>
-            <value> <string>object_view</string> </value>
-        </item>
-        <item>
-            <key> <string>condition</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>description</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>metadata</string> </value>
-        </item>
-        <item>
-            <key> <string>permissions</string> </key>
-            <value>
-              <tuple>
-                <string>Manage properties</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>priority</string> </key>
-            <value> <int>10</int> </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>Metadata</string> </value>
-        </item>
-        <item>
-            <key> <string>visible</string> </key>
-            <value> <int>1</int> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-  <record id="5" aka="AAAAAAAAAAU=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>action</string> </key>
+            <key> <string>_aliases</string> </key>
             <value>
-              <persistent> <string encoding="base64">AAAAAAAAAA0=</string> </persistent>
+              <dictionary/>
             </value>
         </item>
         <item>
-            <key> <string>category</string> </key>
-            <value> <string>object_ui</string> </value>
-        </item>
-        <item>
-            <key> <string>condition</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>description</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>settings</string> </value>
-        </item>
-        <item>
-            <key> <string>permissions</string> </key>
-            <value>
-              <tuple>
-                <string>View</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>priority</string> </key>
-            <value> <int>10</int> </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>Settings</string> </value>
-        </item>
-        <item>
-            <key> <string>visible</string> </key>
-            <value> <int>1</int> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-  <record id="6" aka="AAAAAAAAAAY=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>action</string> </key>
-            <value>
-              <persistent> <string encoding="base64">AAAAAAAAAA4=</string> </persistent>
-            </value>
-        </item>
-        <item>
-            <key> <string>category</string> </key>
-            <value> <string>object_sort</string> </value>
-        </item>
-        <item>
-            <key> <string>condition</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>description</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>sort</string> </value>
-        </item>
-        <item>
-            <key> <string>permissions</string> </key>
+            <key> <string>_owner</string> </key>
             <value>
-              <tuple>
-                <string>View</string>
-              </tuple>
+              <none/>
             </value>
         </item>
         <item>
-            <key> <string>priority</string> </key>
-            <value> <int>10</int> </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>Sort</string> </value>
-        </item>
-        <item>
-            <key> <string>visible</string> </key>
-            <value> <int>1</int> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-  <record id="7" aka="AAAAAAAAAAc=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>action</string> </key>
+            <key> <string>_roles</string> </key>
             <value>
-              <persistent> <string encoding="base64">AAAAAAAAAA8=</string> </persistent>
+              <list/>
             </value>
         </item>
         <item>
-            <key> <string>category</string> </key>
-            <value> <string>object_search</string> </value>
-        </item>
-        <item>
-            <key> <string>condition</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>description</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>search</string> </value>
-        </item>
-        <item>
-            <key> <string>permissions</string> </key>
+            <key> <string>allowed_content_types</string> </key>
             <value>
-              <tuple>
-                <string>View</string>
-              </tuple>
+              <tuple/>
             </value>
         </item>
         <item>
-            <key> <string>priority</string> </key>
-            <value> <int>10</int> </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>Search</string> </value>
-        </item>
-        <item>
-            <key> <string>visible</string> </key>
-            <value> <int>1</int> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-  <record id="8" aka="AAAAAAAAAAg=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>action</string> </key>
+            <key> <string>base_category_list</string> </key>
             <value>
-              <persistent> <string encoding="base64">AAAAAAAAABA=</string> </persistent>
+              <tuple/>
             </value>
         </item>
         <item>
-            <key> <string>category</string> </key>
-            <value> <string>object_exchange</string> </value>
+            <key> <string>content_icon</string> </key>
+            <value> <string>folder_icon.gif</string> </value>
         </item>
         <item>
-            <key> <string>condition</string> </key>
-            <value> <string></string> </value>
+            <key> <string>content_meta_type</string> </key>
+            <value> <string>ERP5 Folder</string> </value>
         </item>
         <item>
             <key> <string>description</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>export_xml</string> </value>
-        </item>
-        <item>
-            <key> <string>permissions</string> </key>
-            <value>
-              <tuple>
-                <string>View</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>priority</string> </key>
-            <value> <int>10</int> </value>
+            <value> <string>Folders allow to store a large number of documents (1,000,000 should not\n
+be a problem).</string> </value>
         </item>
         <item>
-            <key> <string>title</string> </key>
-            <value> <string>Export as XML</string> </value>
+            <key> <string>factory</string> </key>
+            <value> <string>addFolder</string> </value>
         </item>
         <item>
-            <key> <string>visible</string> </key>
+            <key> <string>filter_content_types</string> </key>
             <value> <int>1</int> </value>
         </item>
-      </dictionary>
-    </pickle>
-  </record>
-  <record id="9" aka="AAAAAAAAAAk=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
         <item>
-            <key> <string>action</string> </key>
+            <key> <string>hidden_content_type_list</string> </key>
             <value>
-              <persistent> <string encoding="base64">AAAAAAAAABE=</string> </persistent>
+              <tuple/>
             </value>
         </item>
-        <item>
-            <key> <string>category</string> </key>
-            <value> <string>object_print</string> </value>
-        </item>
-        <item>
-            <key> <string>condition</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>description</string> </key>
-            <value> <string></string> </value>
-        </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>print</string> </value>
+            <value> <string>Nexedi VPN Module</string> </value>
         </item>
         <item>
-            <key> <string>permissions</string> </key>
+            <key> <string>property_sheet_list</string> </key>
             <value>
-              <tuple>
-                <string>View</string>
-              </tuple>
+              <tuple/>
             </value>
         </item>
-        <item>
-            <key> <string>priority</string> </key>
-            <value> <int>10</int> </value>
-        </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string>Print</string> </value>
-        </item>
-        <item>
-            <key> <string>visible</string> </key>
-            <value> <int>1</int> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-  <record id="10" aka="AAAAAAAAAAo=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>text</string> </key>
-            <value> <string>string:${object_url}/VPN_list</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-  <record id="11" aka="AAAAAAAAAAs=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>text</string> </key>
-            <value> <string>string:${object_url}/Folder_viewObjectList</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-  <record id="12" aka="AAAAAAAAAAw=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>text</string> </key>
-            <value> <string>string:${object_url}/Base_viewMetadata</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-  <record id="13" aka="AAAAAAAAAA0=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>text</string> </key>
-            <value> <string>string:${object_url}/Base_viewUIDialog</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-  <record id="14" aka="AAAAAAAAAA4=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>text</string> </key>
-            <value> <string>string:${object_url}/Folder_viewSortOnDialog</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-  <record id="15" aka="AAAAAAAAAA8=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>text</string> </key>
-            <value> <string>string:${object_url}/VPN_search</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-  <record id="16" aka="AAAAAAAAABA=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>text</string> </key>
-            <value> <string>string:${object_url}/VPN_exportXML</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-  <record id="17" aka="AAAAAAAAABE=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>text</string> </key>
-            <value> <string>string:${object_url}/VPN_list_print</string> </value>
+            <value> <string>Nexedi VPN</string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/nexedi_vpn/PortalTypeTemplateItem/portal_types/Nexedi%20VPN.xml b/bt5/nexedi_vpn/PortalTypeTemplateItem/portal_types/Nexedi%20VPN.xml
index e54d1a5d3a53bb31f5afa9d7509ef7fba42505e0..8803a4aea65a15750092d895b7f01c038988b44a 100644
--- a/bt5/nexedi_vpn/PortalTypeTemplateItem/portal_types/Nexedi%20VPN.xml
+++ b/bt5/nexedi_vpn/PortalTypeTemplateItem/portal_types/Nexedi%20VPN.xml
@@ -21,14 +21,22 @@
         <item>
             <key> <string>_actions</string> </key>
             <value>
-              <tuple>
-                <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
-                <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
-                <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
-                <persistent> <string encoding="base64">AAAAAAAAAAU=</string> </persistent>
-                <persistent> <string encoding="base64">AAAAAAAAAAY=</string> </persistent>
-                <persistent> <string encoding="base64">AAAAAAAAAAc=</string> </persistent>
-              </tuple>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>_aliases</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>(Default)</string> </key>
+                    <value> <string>VPN_view</string> </value>
+                </item>
+                <item>
+                    <key> <string>view</string> </key>
+                    <value> <string>VPN_view</string> </value>
+                </item>
+              </dictionary>
             </value>
         </item>
         <item>
@@ -90,460 +98,4 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="2" aka="AAAAAAAAAAI=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>action</string> </key>
-            <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAg=</string> </persistent>
-            </value>
-        </item>
-        <item>
-            <key> <string>category</string> </key>
-            <value> <string>object_view</string> </value>
-        </item>
-        <item>
-            <key> <string>condition</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>description</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>view</string> </value>
-        </item>
-        <item>
-            <key> <string>permissions</string> </key>
-            <value>
-              <tuple>
-                <string>View</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>priority</string> </key>
-            <value> <int>10</int> </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>View</string> </value>
-        </item>
-        <item>
-            <key> <string>visible</string> </key>
-            <value> <int>1</int> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-  <record id="3" aka="AAAAAAAAAAM=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>action</string> </key>
-            <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAk=</string> </persistent>
-            </value>
-        </item>
-        <item>
-            <key> <string>category</string> </key>
-            <value> <string>object_print</string> </value>
-        </item>
-        <item>
-            <key> <string>condition</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>description</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>print</string> </value>
-        </item>
-        <item>
-            <key> <string>permissions</string> </key>
-            <value>
-              <tuple>
-                <string>View</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>priority</string> </key>
-            <value> <int>10</int> </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>Print</string> </value>
-        </item>
-        <item>
-            <key> <string>visible</string> </key>
-            <value> <int>1</int> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-  <record id="4" aka="AAAAAAAAAAQ=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>action</string> </key>
-            <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAo=</string> </persistent>
-            </value>
-        </item>
-        <item>
-            <key> <string>category</string> </key>
-            <value> <string>object_view</string> </value>
-        </item>
-        <item>
-            <key> <string>condition</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>description</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>history</string> </value>
-        </item>
-        <item>
-            <key> <string>permissions</string> </key>
-            <value>
-              <tuple>
-                <string>View</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>priority</string> </key>
-            <value> <int>10</int> </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>History</string> </value>
-        </item>
-        <item>
-            <key> <string>visible</string> </key>
-            <value> <int>1</int> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-  <record id="5" aka="AAAAAAAAAAU=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>action</string> </key>
-            <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAs=</string> </persistent>
-            </value>
-        </item>
-        <item>
-            <key> <string>category</string> </key>
-            <value> <string>object_view</string> </value>
-        </item>
-        <item>
-            <key> <string>condition</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>description</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>metadata</string> </value>
-        </item>
-        <item>
-            <key> <string>permissions</string> </key>
-            <value>
-              <tuple>
-                <string>Manage properties</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>priority</string> </key>
-            <value> <int>10</int> </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>Metadata</string> </value>
-        </item>
-        <item>
-            <key> <string>visible</string> </key>
-            <value> <int>1</int> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-  <record id="6" aka="AAAAAAAAAAY=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>action</string> </key>
-            <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAw=</string> </persistent>
-            </value>
-        </item>
-        <item>
-            <key> <string>category</string> </key>
-            <value> <string>object_action</string> </value>
-        </item>
-        <item>
-            <key> <string>condition</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>description</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>translate</string> </value>
-        </item>
-        <item>
-            <key> <string>permissions</string> </key>
-            <value>
-              <tuple>
-                <string>Translate Content</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>priority</string> </key>
-            <value> <int>10</int> </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>Translate</string> </value>
-        </item>
-        <item>
-            <key> <string>visible</string> </key>
-            <value> <int>1</int> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-  <record id="7" aka="AAAAAAAAAAc=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>action</string> </key>
-            <value>
-              <persistent> <string encoding="base64">AAAAAAAAAA0=</string> </persistent>
-            </value>
-        </item>
-        <item>
-            <key> <string>category</string> </key>
-            <value> <string>object_exchange</string> </value>
-        </item>
-        <item>
-            <key> <string>condition</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>description</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>export_xml</string> </value>
-        </item>
-        <item>
-            <key> <string>permissions</string> </key>
-            <value>
-              <tuple>
-                <string>View</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>priority</string> </key>
-            <value> <int>10</int> </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>Export to XML</string> </value>
-        </item>
-        <item>
-            <key> <string>visible</string> </key>
-            <value> <int>1</int> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-  <record id="8" aka="AAAAAAAAAAg=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>text</string> </key>
-            <value> <string>string:${object_url}/VPN_view</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-  <record id="9" aka="AAAAAAAAAAk=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>text</string> </key>
-            <value> <string>string:${object_url}/VPN_print</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-  <record id="10" aka="AAAAAAAAAAo=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>text</string> </key>
-            <value> <string>string:${object_url}/Base_viewHistory</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-  <record id="11" aka="AAAAAAAAAAs=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>text</string> </key>
-            <value> <string>string:${object_url}/Base_viewMetadata</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-  <record id="12" aka="AAAAAAAAAAw=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>text</string> </key>
-            <value> <string>string:${object_url}/translation_template_view</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-  <record id="13" aka="AAAAAAAAAA0=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>text</string> </key>
-            <value> <string>string:${object_url}/VPN_exportXML</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
 </ZopeData>
diff --git a/bt5/nexedi_vpn/PortalTypeTemplateItem/workflow_chain_type.xml b/bt5/nexedi_vpn/PortalTypeTemplateItem/workflow_chain_type.xml
deleted file mode 100644
index e61cffe22dfafa53c34b149796afcd22cad01e95..0000000000000000000000000000000000000000
--- a/bt5/nexedi_vpn/PortalTypeTemplateItem/workflow_chain_type.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<workflow_chain>
- <chain>
-  <type>Nexedi VPN</type>
-  <workflow>edit_workflow</workflow>
- </chain>
- <chain>
-  <type>Nexedi VPN Module</type>
-  <workflow></workflow>
- </chain>
-</workflow_chain>
\ No newline at end of file
diff --git a/bt5/nexedi_vpn/SkinTemplateItem/portal_skins/VPN_getCategories.xml b/bt5/nexedi_vpn/SkinTemplateItem/portal_skins/VPN_getCategories.xml
index f85bf6ac68554c82d916ea747e9194132d6ae969..64f0a7335c257a832612380ad354025a9128d8b1 100644
--- a/bt5/nexedi_vpn/SkinTemplateItem/portal_skins/VPN_getCategories.xml
+++ b/bt5/nexedi_vpn/SkinTemplateItem/portal_skins/VPN_getCategories.xml
@@ -14,7 +14,9 @@
       <dictionary>
         <item>
             <key> <string>Python_magic</string> </key>
-            <value> <string encoding="base64">O/INCg==</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>Script_magic</string> </key>
@@ -154,38 +156,9 @@ return return_value\n
         </item>
         <item>
             <key> <string>_code</string> </key>
-            <value> <string encoding="base64">YwAAAAAAAAAAAwAAAEAAAABzEwAAAGUAAGQBAGQCAIQCAFoBAGQAAFMoAwAAAE5pAQAAAGMCAAAA
-FgAAABgAAABDAAAAc6ICAABoAAAEZAEAdAAAdAAAZAIAZgEAZAIAZAMAZgIAZwQAAzwEZAQAdAAA
-dAAAZAIAZgEAZAIAZAUAZgIAZwQAAzx9AwBkBgBkBgBmAgBnAQB9BAB5HAB0AwB0BAB0BQBkBwCD
-AgB8AACDAgB9CABXbgsAAQEBfAQAU24BAFhnAAB9CQB5MwB0AwB0AwB8AwB8AACDAgB0CQB8AQCD
-AQCDAgB9CwB8CwBvCgABfAsAfQkAbgEAAVduBwABAQFuAQBYZwAAfQwAeHYAdA0AfAkAgwEARF1o
-AH0LAHlYAHQEAHQDAHwIAHwLAIMCAGQIAIMCAIMAAH0OAHQPAHwOAIMBAGQJAGoEAG8mAAF0BAB8
-DABkCgCDAgB0AwB8DgBkCQBkAACFAgCDAgCDAQABbgEAAVdx0QABAQFx0QBYcdEAV3QEAHwIAGQI
-AIMCAIMAAH0QAHhIAXQNAHwQAIMBAERdOgF9EQBkCQB9EgB4PgB0DQB8DACDAQBEXTAAfQsAdAMA
-fAsAZAsAgwIAdAMAfBEAZAsAgwIAagIAbwsAAWQLAH0SAFBxdQEBcXUBV3wSAG88AAF4OQB0DQB8
-CQCDAQBEXScAfQsAfAsAdAMAfBEAZAsAgwIAagIAbwsAAWQLAH0SAFBxvQEBcb0BV24BAAF8EgBv
-owABZwAAZwAAZwIAfRMAZAYAZAYAZwIAfRQAdAQAdAMAfBEAZAsAgwIAZAwAgwIAZA0AgwEAfRMA
-dAMAfBMAdA8AfBMAgwEAZAkAGIMCAH0UAHQEAHQDAHwRAGQJAIMCAGQMAIMCAGQNAIMBAH0TAHQD
-AHwTAHQPAHwTAIMBAGQJABiDAgB9FQB0BAB8BABkDgCDAgB8FAB8FQBmAgCDAQABcVwBAXFcAVd8
-BABTZAAAUygPAAAATnMRAAAAbmV0d29ya19pbnRlcmZhY2VzAwAAAHBwcHMEAAAAd2xhbnMMAAAA
-bmV0d29ya190eXBlcwgAAAB3aXJlbGVzc3MAAAAAcxEAAABwb3J0YWxfY2F0ZWdvcmllc3MYAAAA
-Z2V0Q2F0ZWdvcnlDaGlsZEl0ZW1MaXN0aQEAAABzBgAAAGV4dGVuZGkAAAAAcwUAAABzcGxpdHMB
-AAAAL3MGAAAAYXBwZW5kKBYAAABzBAAAAE5vbmVzCQAAAGZvcmJpZGRlbnMMAAAAcmV0dXJuX3Zh
-bHVlcwkAAABfZ2V0aXRlbV9zCQAAAF9nZXRhdHRyX3MHAAAAY29udGV4dHMNAAAAY2F0ZWdvcnlf
-bmFtZXMIAAAAY2F0ZWdvcnlzDgAAAGZvcmJpZGRlbl9oZXJlcwMAAABpbnRzEAAAAGludGVyZmFj
-ZV9udW1iZXJzBAAAAGZvcmJzFAAAAGZvcmJpZGRlbl9jYXRlZ29yaWVzcwkAAABfZ2V0aXRlcl9z
-AwAAAGNhdHMDAAAAbGVucwoAAABjYXRlZ29yaWVzcwYAAABjb3VwbGVzBgAAAHRvX2FkZHMIAAAA
-c3BsaXR0ZWRzBQAAAHZhbHVlcwYAAAB2YWx1ZTIoFgAAAHMNAAAAY2F0ZWdvcnlfbmFtZXMQAAAA
-aW50ZXJmYWNlX251bWJlcnMEAAAATm9uZXMJAAAAZm9yYmlkZGVucwwAAAByZXR1cm5fdmFsdWVz
-CQAAAF9nZXRpdGVtX3MJAAAAX2dldGF0dHJfcwcAAABjb250ZXh0cwgAAABjYXRlZ29yeXMOAAAA
-Zm9yYmlkZGVuX2hlcmVzAwAAAGludHMEAAAAZm9yYnMUAAAAZm9yYmlkZGVuX2NhdGVnb3JpZXNz
-CQAAAF9nZXRpdGVyX3MDAAAAY2F0cwMAAABsZW5zCgAAAGNhdGVnb3JpZXNzBgAAAGNvdXBsZXMG
-AAAAdG9fYWRkcwgAAABzcGxpdHRlZHMFAAAAdmFsdWVzBgAAAHZhbHVlMigAAAAAKAAAAABzDwAA
-AFNjcmlwdCAoUHl0aG9uKXMRAAAAVlBOX2dldENhdGVnb3JpZXMBAAAAc2QAAAAACQoBAwEGARIB
-AwEDAQYBEQQPAQMBHwIIBQYBAwEeAQcBEQIEBAYBDQAGAQMBGwEWASoCCAUSBA0ABgIGAQ0ABgEf
-AQYBCQEHAQ0ABgEWAQYBDQMHAQwBDAEeARkBHgEcAh4CKAIAAABzBAAAAE5vbmVzEQAAAFZQTl9n
-ZXRDYXRlZ29yaWVzKAIAAABzBAAAAE5vbmVzEQAAAFZQTl9nZXRDYXRlZ29yaWVzKAAAAAAoAAAA
-AHMPAAAAU2NyaXB0IChQeXRob24pcwgAAAA8bW9kdWxlPgEAAABzAAAAAA==</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>_owner</string> </key>
diff --git a/bt5/nexedi_vpn/SkinTemplateItem/portal_skins/VPN_getVPNs.xml b/bt5/nexedi_vpn/SkinTemplateItem/portal_skins/VPN_getVPNs.xml
index cb06737988bdef3c588a030e73fdd0552df5a82d..065cfe6e6be1be4bf7dd1544f8d1aaed084c73b7 100644
--- a/bt5/nexedi_vpn/SkinTemplateItem/portal_skins/VPN_getVPNs.xml
+++ b/bt5/nexedi_vpn/SkinTemplateItem/portal_skins/VPN_getVPNs.xml
@@ -14,7 +14,9 @@
       <dictionary>
         <item>
             <key> <string>Python_magic</string> </key>
-            <value> <string encoding="base64">O/INCg==</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>Script_magic</string> </key>
@@ -76,14 +78,9 @@ else:\n
         </item>
         <item>
             <key> <string>_code</string> </key>
-            <value> <string encoding="base64">YwAAAAAAAAAAAQAAAEAAAABzDQAAAGQBAIQAAFoAAGQAAFMoAgAAAE5jAAAAAAIAAAAJAAAAQwAA
-AHNHAAAAdAAAdAEAZAEAgwIAgwAAZAIAagIAbwsAAXQBAGcBAFNuIAABdAAAdAEAZAMAgwIAZAQA
-aAAABGQFAGQCAAM8gwABU2QAAFMoBgAAAE5zDQAAAGdldFBvcnRhbFR5cGVzCgAAAE5leGVkaSBW
-UE5zDQAAAGNvbnRlbnRWYWx1ZXNzBgAAAGZpbHRlcnMLAAAAcG9ydGFsX3R5cGUoAgAAAHMJAAAA
-X2dldGF0dHJfcwcAAABjb250ZXh0KAIAAABzCQAAAF9nZXRhdHRyX3MHAAAAY29udGV4dCgAAAAA
-KAAAAABzDwAAAFNjcmlwdCAoUHl0aG9uKXMLAAAAVlBOX2dldFZQTnMBAAAAcwYAAAAAAhkBCwIo
-AQAAAHMLAAAAVlBOX2dldFZQTnMoAQAAAHMLAAAAVlBOX2dldFZQTnMoAAAAACgAAAAAcw8AAABT
-Y3JpcHQgKFB5dGhvbilzCAAAADxtb2R1bGU+AQAAAHMAAAAA</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>_owner</string> </key>
diff --git a/bt5/nexedi_vpn/SkinTemplateItem/portal_skins/VPN_getXMLList.xml b/bt5/nexedi_vpn/SkinTemplateItem/portal_skins/VPN_getXMLList.xml
index 75676ba80c80764b64ce7e63c0704930c444b0c3..ba48ec18b1c9148843db36d24b147e21ae4d9909 100644
--- a/bt5/nexedi_vpn/SkinTemplateItem/portal_skins/VPN_getXMLList.xml
+++ b/bt5/nexedi_vpn/SkinTemplateItem/portal_skins/VPN_getXMLList.xml
@@ -14,7 +14,9 @@
       <dictionary>
         <item>
             <key> <string>Python_magic</string> </key>
-            <value> <string encoding="base64">O/INCg==</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>Script_magic</string> </key>
@@ -150,87 +152,9 @@ return return_value\n
         </item>
         <item>
             <key> <string>_code</string> </key>
-            <value> <string encoding="base64">YwAAAAAAAAAAAQAAAEAAAABzDQAAAGQBAIQAAFoAAGQAAFMoAgAAAE5jAAAAABIAAAA6AAAAQwAA
-AHOcBwAAdAAAdAEAZAEAgwIAgwAAZAIAagIAfQIAdAAAdAEAZAEAgwIAgwAAZAMAagIAfQMAdAAA
-dAEAZAQAgwIAgwAAZAMAagIAfQQAaAAABGQFAGQGAAM8BGQHAGgAAARkCABkCQADPARkCgBkCwAD
-PGYBAAM8aAAABGQFAGQMAAM8BGQHAGgAAARkCABkDQADPARkCgBkCwADPGYBAAM8aAAABGQFAGQO
-AAM8BGQHAGgAAARkCABkDwADPARkCgBkCwADPGYBAAM8aAAABGQFAGQQAAM8BGQHAGgAAARkCABk
-EQADPARkCgBkCwADPGYBAAM8aAAABGQFAGQSAAM8BGQHAGgAAARkCABkEwADPARkCgBkCwADPGYB
-AAM8aAAABGQFAGQUAAM8BGQHAGgAAARkCABkFQADPARkCgBkCwADPGYBAAM8aAAABGQFAGQWAAM8
-BGQHAGgAAARkCABkFwADPARkCgBkCwADPGYBAAM8aAAABGQFAGQYAAM8BGQHAGgAAARkCABkGQAD
-PARkCgB8AwADPGgAAARkCABkGgADPARkCgB8BAADPGYCAAM8aAAABGQFAGQbAAM8BGQHAGgAAARk
-CABkGQADPARkCgB8AgADPGYBAAM8aAAABGQFAGQcAAM8BGQHAGgAAARkCABkHQADPARkCgB8AgAD
-PGYBAAM8aAAABGQFAGQeAAM8BGQHAGgAAARkCABkHwADPARkCgB8AgADPGYBAAM8aAAABGQFAGQg
-AAM8BGQHAGgAAARkCABkIQADPARkCgB8AgADPGYBAAM8aAAABGQFAGQiAAM8BGQHAGgAAARkCABk
-IwADPARkCgBkCwADPGYBAAM8aAAABGQFAGQkAAM8BGQHAGgAAARkCABkJQADPARkCgBkCwADPGYB
-AAM8aAAABGQFAGQmAAM8BGQHAGgAAARkCABkJwADPARkCgBkCwADPGYBAAM8aAAABGQFAGQoAAM8
-BGQHAGgAAARkCABkKQADPARkCgBkCwADPGYBAAM8aAAABGQFAGQqAAM8BGQHAGgAAARkCABkKwAD
-PARkCgBkCwADPGYBAAM8aAAABGQFAGQsAAM8BGQHAGgAAARkCABkLQADPARkCgB8AwADPGgAAARk
-CABkLgADPARkCgB8BAADPGYCAAM8aAAABGQFAGQvAAM8BGQHAGgAAARkCABkMAADPARkCgB8AwAD
-PGgAAARkCABkMQADPARkCgB8BAADPGYCAAM8aAAABGQFAGQyAAM8BGQHAGgAAARkCABkMwADPARk
-CgB8AwADPGgAAARkCABkNAADPARkCgB8BAADPGYCAAM8aAAABGQFAGQ1AAM8BGQHAGgAAARkCABk
-NgADPARkCgB8AwADPGgAAARkCABkNwADPARkCgB8BAADPGYCAAM8aAAABGQFAGQ4AAM8BGQHAGgA
-AARkCABkOQADPARkCgB8AwADPGgAAARkCABkOgADPARkCgB8BAADPGYCAAM8aAAABGQFAGQ7AAM8
-BGQHAGgAAARkCABkLQADPARkCgB8AgADPGYBAAM8aAAABGQFAGQ8AAM8BGQHAGgAAARkCABkMAAD
-PARkCgB8AgADPGYBAAM8aAAABGQFAGQ9AAM8BGQHAGgAAARkCABkPgADPARkCgB8AgADPGYBAAM8
-aAAABGQFAGQ/AAM8BGQHAGgAAARkCABkMwADPARkCgB8AgADPGYBAAM8aAAABGQFAGRAAAM8BGQH
-AGgAAARkCABkNgADPARkCgB8AgADPGYBAAM8aAAABGQFAGRBAAM8BGQHAGgAAARkCABkQgADPARk
-CgBkCwADPGYBAAM8aAAABGQFAGRDAAM8BGQHAGgAAARkCABkRAADPARkCgBkCwADPGYBAAM8aAAA
-BGQFAGRFAAM8BGQHAGgAAARkCABkRgADPARkCgBkCwADPGYBAAM8aAAABGQFAGRHAAM8BGQHAGgA
-AARkCABkSAADPARkCgBkCwADPGYBAAM8aAAABGQFAGRJAAM8BGQHAGgAAARkCABkSgADPARkCgBk
-CwADPGYBAAM8aAAABGQFAGRLAAM8BGQHAGgAAARkCABkTAADPARkCgBkCwADPGYBAAM8aAAABGQF
-AGRNAAM8BGQHAGgAAARkCABkTgADPARkCgBkCwADPGYBAAM8aAAABGQFAGRPAAM8BGQHAGgAAARk
-CABkUAADPARkCgBkCwADPGYBAAM8aAAABGQFAGRRAAM8BGQHAGgAAARkCABkUgADPARkCgBkCwAD
-PGYBAAM8ZyQAfQUAZwAAfQYAeNcAdAcAdAgAdAkAfAUAgwEAgwEAgwEARF29AH0KAHQLAHwFAHwK
-AIMCAH0MAHilAHQHAHQIAHQJAHQLAHwMAGQHAIMCAIMBAIMBAIMBAERdggB9DQB0CwB0CwB8DABk
-BwCDAgB8DQCDAgB9DgB0CwB8DgBkCgCDAgBvVAABdA8AdAEAdAsAfA4AZAgAgwIAgwIAfRAAfBAA
-gwAAfREAdAAAfAYAZFMAgwIAaAAABGRUAHQLAHwMAGQFAIMCAAM8BGRVAHwRAAM8gwEAAVBxCgcB
-cQoHV3HTBld8BgBTZAAAUyhWAAAATnMUAAAAZ2V0U2Vjb25kTmV0d29ya1R5cGVzCAAAAHdpcmVs
-ZXNzcwgAAABldGhlcm5ldHMTAAAAZ2V0VGhpcmROZXR3b3JrVHlwZXMIAAAAWE1MX25hbWVzCgAA
-AG1vZGVtX3R5cGVzBAAAAG5hbWVzBgAAAG1ldGhvZHMMAAAAZ2V0TW9kZW1UeXBlcwkAAABjb25k
-aXRpb25pAQAAAHMMAAAAbW9kZW1fZGV2aWNlcxMAAABnZXROZXR3b3JrSW50ZXJmYWNlcw8AAABj
-b25uZWN0aW9uX3R5cGVzEQAAAGdldENvbm5lY3Rpb25UeXBlcwgAAABwcHBfdXNlcnMKAAAAZ2V0
-UHBwVXNlcnMMAAAAcHBwX3Bhc3N3b3Jkcw4AAABnZXRQcHBQYXNzd29yZHMTAAAAZXh0ZXJuYWxf
-aXBfYWRkcmVzc3MUAAAAZ2V0RXh0ZXJuYWxJcEFkZHJlc3NzDQAAAGJyaWRnZV9kZXZpY2VzDwAA
-AGdldEJyaWRnZURldmljZXMKAAAAbGFuX2RldmljZXMZAAAAZ2V0U2Vjb25kTmV0d29ya0ludGVy
-ZmFjZXMYAAAAZ2V0VGhpcmROZXR3b3JrSW50ZXJmYWNlcwsAAAB3bGFuX2RldmljZXMMAAAAd2xh
-bl93ZXBfa2V5cxMAAABnZXRTZWNvbmRXbGFuV2VwS2V5cwoAAAB3bGFuX2Vzc2lkcxIAAABnZXRT
-ZWNvbmRXbGFuRXNzaWRzDAAAAHdsYW5fY2hhbm5lbHMUAAAAZ2V0U2Vjb25kV2xhbkNoYW5uZWxz
-CgAAAGlwX2FkZHJlc3NzDAAAAGdldElwQWRkcmVzc3MHAAAAbmV0bWFza3MKAAAAZ2V0TmV0bWFz
-a3MMAAAAbmV0bWFza19iaXRzcw4AAABnZXROZXRtYXNrQml0c3MPAAAAbmV0d29ya19hZGRyZXNz
-cxEAAABnZXROZXR3b3JrQWRkcmVzc3MRAAAAYnJvYWRjYXN0X2FkZHJlc3NzEwAAAGdldEJyb2Fk
-Y2FzdEFkZHJlc3NzEwAAAGxhbl9uZXR3b3JrX2FkZHJlc3NzFwAAAGdldFNlY29uZE5ldHdvcmtB
-ZGRyZXNzcxYAAABnZXRUaGlyZE5ldHdvcmtBZGRyZXNzcxAAAABsYW5fbmV0bWFza19iaXRzcxQA
-AABnZXRTZWNvbmROZXRtYXNrQml0c3MTAAAAZ2V0VGhpcmROZXRtYXNrQml0c3MUAAAAZGhjcF9s
-YW5fcmFuZ2Vfc3RhcnRzFwAAAGdldFNlY29uZERoY3BSYW5nZVN0YXJ0cxYAAABnZXRUaGlyZERo
-Y3BSYW5nZVN0YXJ0cxIAAABkaGNwX2xhbl9yYW5nZV9lbmRzFQAAAGdldFNlY29uZERoY3BSYW5n
-ZUVuZHMUAAAAZ2V0VGhpcmREaGNwUmFuZ2VFbmRzFQAAAGRoY3BfbGFuX2V4dHJhX2NvbmZpZ3MY
-AAAAZ2V0U2Vjb25kRGhjcEV4dHJhQ29uZmlncxcAAABnZXRUaGlyZERoY3BFeHRyYUNvbmZpZ3MU
-AAAAd2xhbl9uZXR3b3JrX2FkZHJlc3NzEQAAAHdsYW5fbmV0bWFza19iaXRzcw4AAABkaGNwX3ds
-YW5fcG9ydHMVAAAAZ2V0U2Vjb25kRGhjcFdsYW5Qb3J0cxUAAABkaGNwX3dsYW5fcmFuZ2Vfc3Rh
-cnRzEwAAAGRoY3Bfd2xhbl9yYW5nZV9lbmRzDwAAAGJpbmRfc2hhcmVkX2tleXMQAAAAZ2V0Qmlu
-ZFNoYXJlZEtleXMJAAAAYmluZF96b25lcwsAAABnZXRCaW5kWm9uZXMMAAAAYmluZF9yZWNvcmRz
-cw4AAABnZXRCaW5kUmVjb3Jkc3MUAAAAYmluZF9yZXZlcnNlX3JlY29yZHNzFQAAAGdldEJpbmRS
-ZXZlcnNlUmVjb3Jkc3MIAAAAdnBuX3R5cGVzCgAAAGdldFZwblR5cGVzEgAAAGlwc2VjX2V4dHJh
-X2NvbmZpZ3MTAAAAZ2V0SXBzZWNFeHRyYUNvbmZpZ3McAAAAc2hvcmV3YWxsX3J1bGVzX2V4dHJh
-X2NvbmZpZ3McAAAAZ2V0U2hvcmV3YWxsUnVsZXNFeHRyYUNvbmZpZ3MNAAAAcm9vdF9wYXNzd29y
-ZHMPAAAAZ2V0Um9vdFBhc3N3b3JkcwwAAAB3ZWJfcGFzc3dvcmRzDgAAAGdldFdlYlBhc3N3b3Jk
-cwYAAABhcHBlbmRzBwAAAFhNTF90YWdzCQAAAFhNTF92YWx1ZSgSAAAAcwkAAABfZ2V0YXR0cl9z
-BwAAAGNvbnRleHRzGAAAAGNvbmRpdGlvbl9zZWNvbmRfaXNfd2xhbnMcAAAAY29uZGl0aW9uX3Nl
-Y29uZF9pc19ldGhlcm5ldHMbAAAAY29uZGl0aW9uX3RoaXJkX2lzX2V0aGVybmV0cwoAAABwcm9w
-ZXJ0aWVzcwwAAAByZXR1cm5fdmFsdWVzCQAAAF9nZXRpdGVyX3MFAAAAcmFuZ2VzAwAAAGxlbnMB
-AAAAaXMJAAAAX2dldGl0ZW1fcw0AAABwcm9wZXJ0eV9saW5lcwEAAABqcwkAAABuYW1lX2xpbmVz
-BwAAAGdldGF0dHJzBgAAAG1ldGhvZHMFAAAAdmFsdWUoEgAAAHMJAAAAX2dldGF0dHJfcwcAAABj
-b250ZXh0cxgAAABjb25kaXRpb25fc2Vjb25kX2lzX3dsYW5zHAAAAGNvbmRpdGlvbl9zZWNvbmRf
-aXNfZXRoZXJuZXRzGwAAAGNvbmRpdGlvbl90aGlyZF9pc19ldGhlcm5ldHMKAAAAcHJvcGVydGll
-c3MMAAAAcmV0dXJuX3ZhbHVlcwkAAABfZ2V0aXRlcl9zBQAAAHJhbmdlcwMAAABsZW5zAQAAAGlz
-CQAAAF9nZXRpdGVtX3MNAAAAcHJvcGVydHlfbGluZXMBAAAAanMJAAAAbmFtZV9saW5lcwcAAABn
-ZXRhdHRycwYAAABtZXRob2RzBQAAAHZhbHVlKAAAAAAoAAAAAHMPAAAAU2NyaXB0IChQeXRob24p
-cw4AAABWUE5fZ2V0WE1MTGlzdAEAAABzdgAAAAAHGAEYARgDAAEqASoBKgEqASoBKgEqASUBGgEq
-ASoBKgEqASoBKgEqASoBKgMlARoBJQEaASUBGgElARoBJQEaAyoBKgEqASoBKgIqASoBKgEqASoB
-KgEqASoBMAQGAxkABgEPAyIABgEbAQ0BGAEMASsBDQMoAQAAAHMOAAAAVlBOX2dldFhNTExpc3Qo
-AQAAAHMOAAAAVlBOX2dldFhNTExpc3QoAAAAACgAAAAAcw8AAABTY3JpcHQgKFB5dGhvbilzCAAA
-ADxtb2R1bGU+AQAAAHMAAAAA</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>_owner</string> </key>
diff --git a/bt5/nexedi_vpn/bt/change_log b/bt5/nexedi_vpn/bt/change_log
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..24dd1049e37b479a4738d1628be54be74c9270b6 100644
--- a/bt5/nexedi_vpn/bt/change_log
+++ b/bt5/nexedi_vpn/bt/change_log
@@ -0,0 +1,4 @@
+2006-07-03 Kevin
+* Add description.
+* Add version.
+* Add no maintenainer (no longer maintain).
\ No newline at end of file
diff --git a/bt5/nexedi_vpn/bt/copyright_list b/bt5/nexedi_vpn/bt/copyright_list
new file mode 100644
index 0000000000000000000000000000000000000000..e8d752e9776b23585d513bc13f26b8e937c4ecc2
--- /dev/null
+++ b/bt5/nexedi_vpn/bt/copyright_list
@@ -0,0 +1 @@
+Copyright (c) 2005-2006 Nexedi SARL
\ No newline at end of file
diff --git a/bt5/nexedi_vpn/bt/description b/bt5/nexedi_vpn/bt/description
index 883e499acd5f88384246e067249144c5238923d6..16448910187acdae42803c7e14b67ab9fd75506e 100644
--- a/bt5/nexedi_vpn/bt/description
+++ b/bt5/nexedi_vpn/bt/description
@@ -1 +1,3 @@
-Nexedi VPN holds information about a VPN Device
\ No newline at end of file
+Nexedi VPN holds information about a VPN Device.
+
+This is an old custom module made by Nexedi for its internal use. No longer maintain.
\ No newline at end of file
diff --git a/bt5/nexedi_vpn/bt/license b/bt5/nexedi_vpn/bt/license
new file mode 100644
index 0000000000000000000000000000000000000000..3a3e12bcad97e4b3bdd6a8bb499fd23a4bcb0819
--- /dev/null
+++ b/bt5/nexedi_vpn/bt/license
@@ -0,0 +1 @@
+GPL
\ No newline at end of file
diff --git a/bt5/nexedi_vpn/bt/maintainer_list b/bt5/nexedi_vpn/bt/maintainer_list
new file mode 100644
index 0000000000000000000000000000000000000000..975948fcc7c9848deb7d9e7f8eda43f850437bb8
--- /dev/null
+++ b/bt5/nexedi_vpn/bt/maintainer_list
@@ -0,0 +1 @@
+nobody
\ No newline at end of file
diff --git a/bt5/nexedi_vpn/bt/revision b/bt5/nexedi_vpn/bt/revision
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/bt5/nexedi_vpn/bt/template_catalog_full_text_key_list b/bt5/nexedi_vpn/bt/template_catalog_full_text_key_list
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/bt5/nexedi_vpn/bt/template_catalog_keyword_key_list b/bt5/nexedi_vpn/bt/template_catalog_keyword_key_list
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/bt5/nexedi_vpn/bt/template_catalog_multivalue_key_list b/bt5/nexedi_vpn/bt/template_catalog_multivalue_key_list
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/bt5/nexedi_vpn/bt/template_catalog_request_key_list b/bt5/nexedi_vpn/bt/template_catalog_request_key_list
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/bt5/nexedi_vpn/bt/template_catalog_topic_key_list b/bt5/nexedi_vpn/bt/template_catalog_topic_key_list
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/bt5/nexedi_vpn/bt/template_constraint_id_list b/bt5/nexedi_vpn/bt/template_constraint_id_list
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/bt5/nexedi_vpn/bt/template_local_roles_list b/bt5/nexedi_vpn/bt/template_local_roles_list
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/bt5/nexedi_vpn/bt/template_portal_type_allowed_content_type_list b/bt5/nexedi_vpn/bt/template_portal_type_allowed_content_type_list
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/bt5/nexedi_vpn/bt/template_portal_type_base_category_list b/bt5/nexedi_vpn/bt/template_portal_type_base_category_list
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/bt5/nexedi_vpn/bt/template_portal_type_hidden_content_type_list b/bt5/nexedi_vpn/bt/template_portal_type_hidden_content_type_list
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/bt5/nexedi_vpn/bt/template_portal_type_property_sheet_list b/bt5/nexedi_vpn/bt/template_portal_type_property_sheet_list
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/bt5/nexedi_vpn/bt/template_portal_type_roles_list b/bt5/nexedi_vpn/bt/template_portal_type_roles_list
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/bt5/nexedi_vpn/bt/template_portal_type_workflow_chain_list b/bt5/nexedi_vpn/bt/template_portal_type_workflow_chain_list
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/bt5/nexedi_vpn/bt/template_update_business_template_workflow b/bt5/nexedi_vpn/bt/template_update_business_template_workflow
new file mode 100644
index 0000000000000000000000000000000000000000..c227083464fb9af8955c90d2924774ee50abb547
--- /dev/null
+++ b/bt5/nexedi_vpn/bt/template_update_business_template_workflow
@@ -0,0 +1 @@
+0
\ No newline at end of file
diff --git a/bt5/nexedi_vpn/bt/template_update_tool b/bt5/nexedi_vpn/bt/template_update_tool
new file mode 100644
index 0000000000000000000000000000000000000000..c227083464fb9af8955c90d2924774ee50abb547
--- /dev/null
+++ b/bt5/nexedi_vpn/bt/template_update_tool
@@ -0,0 +1 @@
+0
\ No newline at end of file
diff --git a/bt5/nexedi_vpn/bt/version b/bt5/nexedi_vpn/bt/version
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..ceab6e11ece0bcec917c12e11d350946f085d549 100644
--- a/bt5/nexedi_vpn/bt/version
+++ b/bt5/nexedi_vpn/bt/version
@@ -0,0 +1 @@
+0.1
\ No newline at end of file