diff --git a/bt5/erp5_pdf_style/SkinTemplateItem/portal_skins/erp5_pdf_style/empty_pdf.xml b/bt5/erp5_pdf_style/SkinTemplateItem/portal_skins/erp5_pdf_style/empty_pdf.xml
index c783989412ca7975b16dde54e1e0284ba816e466..6f5c865ff65d76f4ffc9c45d9cf7f5086a7ef7e6 100644
--- a/bt5/erp5_pdf_style/SkinTemplateItem/portal_skins/erp5_pdf_style/empty_pdf.xml
+++ b/bt5/erp5_pdf_style/SkinTemplateItem/portal_skins/erp5_pdf_style/empty_pdf.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_pdf_style/SkinTemplateItem/portal_skins/erp5_pdf_style/field_pdf_macro.xml b/bt5/erp5_pdf_style/SkinTemplateItem/portal_skins/erp5_pdf_style/field_pdf_macro.xml
index 83a155ddf392eab18a511ceb42b5f5d1fefffee8..b3d7f5b885b8799c1685cc09254eba105d1c40cb 100644
--- a/bt5/erp5_pdf_style/SkinTemplateItem/portal_skins/erp5_pdf_style/field_pdf_macro.xml
+++ b/bt5/erp5_pdf_style/SkinTemplateItem/portal_skins/erp5_pdf_style/field_pdf_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>
@@ -54,6 +51,10 @@
             <key> <string>_text</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
+<?xml version="1.0" encoding="iso-8859-1" ?>\n
+<tal:block xmlns:tal="http://xml.zope.org/namespaces/tal"\n
+           xmlns:metal="http://xml.zope.org/namespaces/metal"\n
+           xmlns:i18n="http://xml.zope.org/namespaces/i18n">\n
 <tal:block tal:replace="nothing">\n
 Users of this page template must define \'field\' name.\n
 It will dispatch to the good macro, and supports proxy fields (in a quite ad-hoc way).\n
@@ -72,13 +73,14 @@ It will dispatch to the good macro, and supports proxy fields (in a quite ad-hoc
   <table><tr><td tal:content="python: \' \'"></td></tr></table>\n
  </tal:block>\n
 \n
+</tal:block>\n
 </tal:block>
 
 ]]></string> </value>
         </item>
         <item>
             <key> <string>content_type</string> </key>
-            <value> <string>text/html</string> </value>
+            <value> <string>application/xml</string> </value>
         </item>
         <item>
             <key> <string>expand</string> </key>
diff --git a/bt5/erp5_pdf_style/SkinTemplateItem/portal_skins/erp5_pdf_style/form_list.xml b/bt5/erp5_pdf_style/SkinTemplateItem/portal_skins/erp5_pdf_style/form_list.xml
index 1e7e8984c3375b68bbf647b7ae7a09220d63f912..6c62477ad17fe7f5fabbc95e5330afa05ba705c8 100644
--- a/bt5/erp5_pdf_style/SkinTemplateItem/portal_skins/erp5_pdf_style/form_list.xml
+++ b/bt5/erp5_pdf_style/SkinTemplateItem/portal_skins/erp5_pdf_style/form_list.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.PDFTemplate</string>
-          <string>PDFTemplate</string>
-        </tuple>
-        <none/>
+        <global name="PDFTemplate" module="Products.ERP5Form.PDFTemplate"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -78,7 +75,7 @@
         </item>
         <item>
             <key> <string>content_type</string> </key>
-            <value> <string>text/html</string> </value>
+            <value> <string>application/xml</string> </value>
         </item>
         <item>
             <key> <string>expand</string> </key>
diff --git a/bt5/erp5_pdf_style/SkinTemplateItem/portal_skins/erp5_pdf_style/form_view.xml b/bt5/erp5_pdf_style/SkinTemplateItem/portal_skins/erp5_pdf_style/form_view.xml
index de751ea9cb2cfb71a49b784d4ca52bd3781a11c4..9dcc4b76b2f726e47361770cc2b1f9aa3a52a623 100644
--- a/bt5/erp5_pdf_style/SkinTemplateItem/portal_skins/erp5_pdf_style/form_view.xml
+++ b/bt5/erp5_pdf_style/SkinTemplateItem/portal_skins/erp5_pdf_style/form_view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.PDFTemplate</string>
-          <string>PDFTemplate</string>
-        </tuple>
-        <none/>
+        <global name="PDFTemplate" module="Products.ERP5Form.PDFTemplate"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -58,6 +55,7 @@
 <document filename="erp5_list.pdf"\n
    xmlns:tal="http://xml.zope.org/namespaces/tal"\n
    xmlns:metal="http://xml.zope.org/namespaces/metal"\n
+   xmlns:i18n="http://xml.zope.org/namespaces/i18n"\n
    tal:define="global frame_width python:25.8"\n
    metal:define-macro="master">\n
   <title>List Print</title>\n
@@ -95,7 +93,7 @@
                                tal:content="python: str(value)"\n
                                tal:condition="not:item_list" />\n
                             <para  style="TableStandard"\n
-                                   tal:content="python: [i[0].replace(\'&nbsp;\', \'\') for i in item_list if i[1] == value][0]"\n
+                                   tal:content="python: [i[0].replace(\'&amp;nbsp;\', \'\') for i in item_list if i[1] == value][0]"\n
                                    tal:condition="item_list" />\n
                       </tal:block>\n
                       <tal:block tal:condition="python: value == None">\n
@@ -131,7 +129,7 @@
         </item>
         <item>
             <key> <string>content_type</string> </key>
-            <value> <string>text/html</string> </value>
+            <value> <string>application/xml</string> </value>
         </item>
         <item>
             <key> <string>expand</string> </key>
diff --git a/bt5/erp5_pdf_style/SkinTemplateItem/portal_skins/erp5_pdf_style/listbox_pdf_macro.xml b/bt5/erp5_pdf_style/SkinTemplateItem/portal_skins/erp5_pdf_style/listbox_pdf_macro.xml
index 88bc5cae379cd4e4d0ed48d483f07f7209bfe79d..7d2dfbc1e549f6a6f972eee301643989546c41e3 100644
--- a/bt5/erp5_pdf_style/SkinTemplateItem/portal_skins/erp5_pdf_style/listbox_pdf_macro.xml
+++ b/bt5/erp5_pdf_style/SkinTemplateItem/portal_skins/erp5_pdf_style/listbox_pdf_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>
@@ -54,7 +51,10 @@
             <key> <string>_text</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
-<html>\n
+<?xml version="1.0" encoding="iso-8859-1" ?>\n
+<html xmlns:tal="http://xml.zope.org/namespaces/tal"\n
+      xmlns:metal="http://xml.zope.org/namespaces/metal"\n
+      xmlns:i18n="http://xml.zope.org/namespaces/i18n">\n
   <head>\n
     <title tal:content="python: here.Localizer.erp5_ui.gettext(template.title).encode(\'utf8\')" >Listbox PDF Macro</title>\n
   </head>\n
@@ -143,7 +143,7 @@
                     <td tal:attributes="colwidth python:\'%.2fcm\' % float(column_width[column_id])"\n
                         tal:define="field python: editable_fields.get(column_id, None)" >\n
                       <para tal:condition="python: field is None"\n
-                            style="TableStandard" tal:content="string:${column_property}"\n
+                            style="TableStandard" tal:content="column_property"\n
                             tal:attributes="style python:isinstance(column_property, (int, long, float)) and \'TableStandardRightAligned\' or \'TableStandardLeftAligned\'" />\n
                       <para tal:condition="python: field is not None"\n
                             style="TableStandard" tal:content="python:field.render_pdf(column_property)"\n
@@ -167,7 +167,7 @@
                     <td tal:attributes="colwidth python:\'%.2fcm\' % float(column_width[column_id])"\n
                         tal:define="field python: editable_fields.get(column_id, None)">\n
                       <para  tal:condition="python: field is None"\n
-                             style="TableLastLine" tal:content="string:${column_property}"\n
+                             style="TableLastLine" tal:content="column_property"\n
                              tal:attributes="style python:isinstance(column_property, (int, long, float)) and \'TableLastLineRightAligned\' or \'TableLastLineLeftAligned\'" />\n
                       <para  tal:condition="python: field is not None"\n
                              style="TableLastLine" tal:content="python: field.render_pdf(column_property)"\n
@@ -204,7 +204,7 @@
         </item>
         <item>
             <key> <string>content_type</string> </key>
-            <value> <string>text/html</string> </value>
+            <value> <string>application/xml</string> </value>
         </item>
         <item>
             <key> <string>expand</string> </key>
diff --git a/bt5/erp5_pdf_style/SkinTemplateItem/portal_skins/erp5_pdf_style/matrixbox_pdf_macro.xml b/bt5/erp5_pdf_style/SkinTemplateItem/portal_skins/erp5_pdf_style/matrixbox_pdf_macro.xml
index 7a090e339de34c4d1bebf82418be3c4d4fd5246c..09090479ba3908fb4b4988494e93a0bb8c97c17c 100644
--- a/bt5/erp5_pdf_style/SkinTemplateItem/portal_skins/erp5_pdf_style/matrixbox_pdf_macro.xml
+++ b/bt5/erp5_pdf_style/SkinTemplateItem/portal_skins/erp5_pdf_style/matrixbox_pdf_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>
@@ -54,7 +51,10 @@
             <key> <string>_text</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
-<html>\n
+<?xml version="1.0" encoding="iso-8859-1" ?>\n
+<html xmlns:tal="http://xml.zope.org/namespaces/tal"\n
+      xmlns:metal="http://xml.zope.org/namespaces/metal"\n
+      xmlns:i18n="http://xml.zope.org/namespaces/i18n">\n
   <head>\n
     <title tal:content="template/title">Matrixbox PDF Macro</title>\n
   </head>\n
@@ -97,7 +97,7 @@
         </item>
         <item>
             <key> <string>content_type</string> </key>
-            <value> <string>text/html</string> </value>
+            <value> <string>application/xml</string> </value>
         </item>
         <item>
             <key> <string>expand</string> </key>
diff --git a/bt5/erp5_pdf_style/SkinTemplateItem/portal_skins/erp5_pdf_style/report_view.xml b/bt5/erp5_pdf_style/SkinTemplateItem/portal_skins/erp5_pdf_style/report_view.xml
index a96060067386ab3adfee4e0b789f03b040deea5b..24e09ef392bd35df380c91aaf7d494d210a086a7 100644
--- a/bt5/erp5_pdf_style/SkinTemplateItem/portal_skins/erp5_pdf_style/report_view.xml
+++ b/bt5/erp5_pdf_style/SkinTemplateItem/portal_skins/erp5_pdf_style/report_view.xml
@@ -55,6 +55,7 @@
 <document filename="erp5_list.pdf"\n
    xmlns:tal="http://xml.zope.org/namespaces/tal"\n
    xmlns:metal="http://xml.zope.org/namespaces/metal"\n
+   xmlns:i18n="http://xml.zope.org/namespaces/i18n"\n
    tal:define="landscape python: int(request.get(\'landscape\', 0) or 0);\n
                global frame_width python:landscape and 25.8 or 19"\n
    metal:define-macro="master">\n
@@ -169,7 +170,7 @@
         </item>
         <item>
             <key> <string>content_type</string> </key>
-            <value> <string>text/html</string> </value>
+            <value> <string>application/xml</string> </value>
         </item>
         <item>
             <key> <string>expand</string> </key>
diff --git a/bt5/erp5_pdf_style/bt/revision b/bt5/erp5_pdf_style/bt/revision
index 7003e7fe1fa0b91d6e034f2f7ac38f2f5989f85c..8783e305111947a209a0689074d8dfa60d33582e 100644
--- a/bt5/erp5_pdf_style/bt/revision
+++ b/bt5/erp5_pdf_style/bt/revision
@@ -1 +1 @@
-51
\ No newline at end of file
+53
\ No newline at end of file