--- a/src/pyams_content/component/paragraph/zmi/header.py	Fri Mar 02 12:14:11 2018 +0100
+++ b/src/pyams_content/component/paragraph/zmi/header.py	Fri Mar 02 12:15:36 2018 +0100
@@ -31,8 +31,8 @@
 from pyams_content.component.paragraph.header import HeaderParagraph
 from pyams_content.component.paragraph.zmi import BaseParagraphAJAXAddForm, BaseParagraphAJAXEditForm, \
     BaseParagraphAddMenu, BaseParagraphPropertiesEditForm
+from pyams_content.features.renderer.zmi.widget import RendererFieldWidget
 from pyams_pagelet.pagelet import pagelet_config
-from pyams_template.template import template_config
 from pyams_utils.adapter import adapter_config
 from pyams_viewlet.viewlet import viewlet_config, BaseContentProvider
 from pyams_zmi.form import AdminDialogAddForm
@@ -62,7 +62,7 @@
     legend = _("Add new header paragraph")
     icon_css_class = 'fa fa-fw fa-header'
 
-    fields = field.Fields(IHeaderParagraph).select('header')
+    fields = field.Fields(IHeaderParagraph).select('header', 'renderer')
     ajax_handler = 'add-header-paragraph.json'
     edit_permission = MANAGE_CONTENT_PERMISSION
 
@@ -92,7 +92,9 @@
     legend = _("Edit header paragraph properties")
     icon_css_class = 'fa fa-fw fa-header'
 
-    fields = field.Fields(IHeaderParagraph).select('header')
+    fields = field.Fields(IHeaderParagraph).select('header', 'renderer')
+    fields['renderer'].widgetFactory = RendererFieldWidget
+
     ajax_handler = 'properties.json'
     edit_permission = MANAGE_CONTENT_PERMISSION
 
@@ -131,6 +133,8 @@
     label_css_class = 'control-label col-md-2'
     input_css_class = 'col-md-10'
 
+    ajax_handler = 'inner-properties.json'
+
     @property
     def buttons(self):
         if self.mode == INPUT_MODE:
@@ -139,22 +143,51 @@
             return button.Buttons()
 
 
+@view_config(name='inner-properties.json', context=IHeaderParagraph, request_type=IPyAMSLayer,
+             permission=MANAGE_CONTENT_PERMISSION, renderer='json', xhr=True)
+class HeaderParagraphInnerAJAXEditForm(BaseParagraphAJAXEditForm, HeaderParagraphInnerEditForm):
+    """Header paragraph inner edit form, JSON renderer"""
+
+    def get_ajax_output(self, changes):
+        output = super(HeaderParagraphInnerAJAXEditForm, self).get_ajax_output(changes)
+        updated = changes.get(IHeaderParagraph, ())
+        if 'renderer' in updated:
+            form = HeaderParagraphInnerEditForm(self.context, self.request)
+            form.update()
+            output.setdefault('events', []).append({
+                'event': 'myams.refresh',
+                'options': {
+                    'object_id': '{0}_{1}_{2}'.format(
+                        self.context.__class__.__name__,
+                        getattr(form.getContent(), '__name__', 'noname').replace('++', ''),
+                        form.id),
+                    'content': form.render()
+                }
+            })
+        return output
+
+
 #
-# HTML paragraph preview
+# Header paragraph preview
 #
 
 @adapter_config(context=(IHeaderParagraph, IPyAMSLayer), provides=IParagraphPreview)
-@template_config(template='templates/header-preview.pt', layer=IPyAMSLayer)
 class HeaderParagraphPreview(BaseContentProvider):
     """Header paragraph preview"""
 
+    def __init__(self, context, request):
+        super(HeaderParagraphPreview, self).__init__(context, request)
+        self.renderer = self.context.get_renderer()
+
     language = None
 
     def update(self):
-        i18n = II18n(self.context)
-        if self.language:
-            for attr in ('header', ):
-                setattr(self, attr, i18n.get_attribute(attr, self.language, request=self.request))
+        if self.renderer is not None:
+            self.renderer.language = self.language
+            self.renderer.update()
+
+    def render(self):
+        if self.renderer is not None:
+            return self.renderer.render()
         else:
-            for attr in ('header', ):
-                setattr(self, attr, i18n.query_attribute(attr, request=self.request))
+            return ''