diff --git a/bt5/erp5_ods_style/ActionTemplateItem/portal_types/portal_properties/ods_export.xml b/bt5/erp5_ods_style/ActionTemplateItem/portal_types/portal_properties/ods_export.xml
index dc0d54f72c2c9385fc91993a228d8d98ae145e23..bcc2caedd1bcad55966f74acaf0415dd54b6e46e 100644
--- a/bt5/erp5_ods_style/ActionTemplateItem/portal_types/portal_properties/ods_export.xml
+++ b/bt5/erp5_ods_style/ActionTemplateItem/portal_types/portal_properties/ods_export.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_ods_style/ActionTemplateItem/portal_types/portal_properties/ods_report.xml b/bt5/erp5_ods_style/ActionTemplateItem/portal_types/portal_properties/ods_report.xml
index bb8ee141afa51871baa4dbad167bcdc00c6b8b8a..04fa71465f6bcce536958839603dfc26c78d9df0 100644
--- a/bt5/erp5_ods_style/ActionTemplateItem/portal_types/portal_properties/ods_report.xml
+++ b/bt5/erp5_ods_style/ActionTemplateItem/portal_types/portal_properties/ods_report.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
-        </tuple>
-        <none/>
+        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_core.xml b/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_core.xml
index ae871bc7febb456fb55e410a250a1458ea940e84..8afd2e631518f3a27a39c2a95fa9a6e85e15e3a7 100644
--- a/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_core.xml
+++ b/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_core.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>OFS.Folder</string>
-          <string>Folder</string>
-        </tuple>
-        <none/>
+        <global name="Folder" module="OFS.Folder"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_core/Base_viewAsODS.xml b/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_core/Base_viewAsODS.xml
index e9997927b6706cdd0898ebb168e0beab906b8f1d..ee97cf6e920b89e05deb74586e77bdca4448b079 100644
--- a/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_core/Base_viewAsODS.xml
+++ b/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_core/Base_viewAsODS.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_core/Base_viewAsODSDialog.xml b/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_core/Base_viewAsODSDialog.xml
index 6ee3450694cf5e5ef9e513e3933e82123a100800..80e6aa86e0abdb2f0d8cd2a103e1e1ff8c6cf5d3 100644
--- a/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_core/Base_viewAsODSDialog.xml
+++ b/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_core/Base_viewAsODSDialog.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_core/Folder_viewContentListAsODSReport.xml b/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_core/Folder_viewContentListAsODSReport.xml
index 0e9c877f3a033f670b349a33664f8934efaf03c3..4c59666512e73a3d6862b8f6c6bbbfeae30af833 100644
--- a/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_core/Folder_viewContentListAsODSReport.xml
+++ b/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_core/Folder_viewContentListAsODSReport.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Report</string>
-          <string>ERP5Report</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Report" module="Products.ERP5Form.Report"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_core/Folder_viewContentListAsODSReportDialog.xml b/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_core/Folder_viewContentListAsODSReportDialog.xml
index 1b5a963b4254bb7794c0999b1a8a648f64d77009..dabb2bbb12d0833bbdc690e436ca9e32c70f7196 100644
--- a/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_core/Folder_viewContentListAsODSReportDialog.xml
+++ b/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_core/Folder_viewContentListAsODSReportDialog.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_core/Folder_viewContentListAsODSReportDialog/your_format.xml b/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_core/Folder_viewContentListAsODSReportDialog/your_format.xml
index aaf310aced05e7b7f96303c79afba496082944d3..5a66663c1f7e84ad96341303d2ddbcf397c51253 100644
--- a/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_core/Folder_viewContentListAsODSReportDialog/your_format.xml
+++ b/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_core/Folder_viewContentListAsODSReportDialog/your_format.xml
@@ -61,7 +61,7 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>description</string> </key>
+                    <key> <string>description</string> </key>
                     <value> <string></string> </value>
                 </item>
                 <item>
@@ -73,7 +73,7 @@
                     <value> <string></string> </value>
                 </item>
                 <item>
-                    <key>                 <string>items</string> </key>
+                    <key> <string>items</string> </key>
                     <value>
                       <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
                     </value>
@@ -83,7 +83,7 @@
                     <value> <string></string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string></string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style.xml b/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style.xml
index 092f118b7f2421b7c552d3d0fa7e2088c2cf4b5f..bd8b18257bca65dc11f9207a8e41e920f9a91856 100644
--- a/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style.xml
+++ b/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>OFS.Folder</string>
-          <string>Folder</string>
-        </tuple>
-        <none/>
+        <global name="Folder" module="OFS.Folder"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/Base_getDynamicODSStyleSheet.xml b/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/Base_getDynamicODSStyleSheet.xml
index c46dec5d8d2abf4eefd26ac57dada2fe1bd7565f..a9d190563313a8d8ea1ea25d68c9773760782c10 100644
--- a/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/Base_getDynamicODSStyleSheet.xml
+++ b/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/Base_getDynamicODSStyleSheet.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/Base_getODSListStyleSheet.xml b/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/Base_getODSListStyleSheet.xml
index 25328c4c716f4221e270f1e6674088d3d1004a87..5c2e80786d6fd3961e82f331f9dbd8f9e0400159 100644
--- a/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/Base_getODSListStyleSheet.xml
+++ b/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/Base_getODSListStyleSheet.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>OFS.Image</string>
-          <string>File</string>
-        </tuple>
-        <none/>
+        <global name="File" module="OFS.Image"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/Base_getODSListStyleSheetLandscape.xml b/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/Base_getODSListStyleSheetLandscape.xml
index 99370fcdf694036faac0908b93421738fe9eeb80..075278e374b88287fd1780f6da4dad3235b28622 100644
--- a/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/Base_getODSListStyleSheetLandscape.xml
+++ b/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/Base_getODSListStyleSheetLandscape.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>OFS.Image</string>
-          <string>File</string>
-        </tuple>
-        <none/>
+        <global name="File" module="OFS.Image"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/Base_getODSStyleSheetLandscape.xml b/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/Base_getODSStyleSheetLandscape.xml
index 13664b0965a5e1db146a828165ebdbb2e9cc859b..d5339f3c7503f5afdcace20132385ab8b40038f8 100644
--- a/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/Base_getODSStyleSheetLandscape.xml
+++ b/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/Base_getODSStyleSheetLandscape.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>OFS.Image</string>
-          <string>File</string>
-        </tuple>
-        <none/>
+        <global name="File" module="OFS.Image"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/field_ods_macro.xml b/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/field_ods_macro.xml
index fc5bc969f1bf502233adea79662d68b18caa3c71..c74ad621808b94365995e283ce79257d330c164f 100644
--- a/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/field_ods_macro.xml
+++ b/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/field_ods_macro.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PageTemplates.ZopePageTemplate</string>
-          <string>ZopePageTemplate</string>
-        </tuple>
-        <none/>
+        <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/form_list.xml b/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/form_list.xml
index c78eb1c5e566d08fd8cafe95cf2e6f2618de0f49..484c794d78e5ba3a757af64778b9b615677c3008 100644
--- a/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/form_list.xml
+++ b/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/form_list.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5OOo.OOoTemplate</string>
-          <string>OOoTemplate</string>
-        </tuple>
-        <none/>
+        <global name="OOoTemplate" module="Products.ERP5OOo.OOoTemplate"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/form_view.xml b/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/form_view.xml
index ea088354804c81977c62c0eb4bf2ed30d34f300f..55b6f00b7fbfa9c159865d1c272b7a469a3e01cf 100644
--- a/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/form_view.xml
+++ b/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/form_view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5OOo.OOoTemplate</string>
-          <string>OOoTemplate</string>
-        </tuple>
-        <none/>
+        <global name="OOoTemplate" module="Products.ERP5OOo.OOoTemplate"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/listbox_ods_macro.xml b/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/listbox_ods_macro.xml
index f8fb0e566ebb6fe198a52a4c993f0ab78ccbeee4..96e28f4b545c31ac8fb51d61ff119a665bf1c025 100644
--- a/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/listbox_ods_macro.xml
+++ b/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/listbox_ods_macro.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PageTemplates.ZopePageTemplate</string>
-          <string>ZopePageTemplate</string>
-        </tuple>
-        <none/>
+        <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/matrixbox_ods_macro.xml b/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/matrixbox_ods_macro.xml
index 0994199fb9ac9549e5660742b2d471b37a50c81f..f8416699a841a0371ea19cbff9da93689bc9d770 100644
--- a/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/matrixbox_ods_macro.xml
+++ b/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/matrixbox_ods_macro.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PageTemplates.ZopePageTemplate</string>
-          <string>ZopePageTemplate</string>
-        </tuple>
-        <none/>
+        <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/report_view.xml b/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/report_view.xml
index ab32c6b5a4a3fe2449c41de0a3d8c9a03ff94c20..f38ad3a5c172d34adfb139f5881ce72818414b4c 100644
--- a/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/report_view.xml
+++ b/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/report_view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5OOo.OOoTemplate</string>
-          <string>OOoTemplate</string>
-        </tuple>
-        <none/>
+        <global name="OOoTemplate" module="Products.ERP5OOo.OOoTemplate"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/style_macros.xml b/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/style_macros.xml
index f59130520163763a30d51f65d81ea9df9b102da4..a7c074a6991d0ba7ffad4459ae967abb4f6d8782 100644
--- a/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/style_macros.xml
+++ b/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/style_macros.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PageTemplates.ZopePageTemplate</string>
-          <string>ZopePageTemplate</string>
-        </tuple>
-        <none/>
+        <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_ods_style/bt/revision b/bt5/erp5_ods_style/bt/revision
index 27a37eb577dd83f8d4da502a4c1cacd0d7dbcb83..bd753ccc4b9f3ab7d4f134e4994d77da191b3537 100644
--- a/bt5/erp5_ods_style/bt/revision
+++ b/bt5/erp5_ods_style/bt/revision
@@ -1 +1 @@
-93
\ No newline at end of file
+94
\ No newline at end of file