--- a/src/pyams_content/component/paragraph/zmi/contact.py	Wed Jun 06 13:32:14 2018 +0200
+++ b/src/pyams_content/component/paragraph/zmi/contact.py	Fri Jun 08 10:33:23 2018 +0200
@@ -33,12 +33,12 @@
     BaseParagraphPropertiesEditForm, BaseParagraphAJAXEditForm, get_json_paragraph_refresh_event, \
     IParagraphEditFormButtons
 from pyams_content.features.renderer.zmi.widget import RendererFieldWidget
+from pyams_form.form import ajax_config
 from pyams_pagelet.pagelet import pagelet_config
 from pyams_skin.event import get_json_form_refresh_event
 from pyams_utils.adapter import adapter_config
 from pyams_viewlet.viewlet import viewlet_config
 from pyams_zmi.form import AdminDialogAddForm
-from pyramid.view import view_config
 from z3c.form import field, button
 from zope.interface import implementer
 
@@ -58,6 +58,8 @@
 
 @pagelet_config(name='add-contact-paragraph.html', context=IParagraphContainerTarget, layer=IPyAMSLayer,
                 permission=MANAGE_CONTENT_PERMISSION)
+@ajax_config(name='add-contact-paragraph.json', context=IParagraphContainerTarget, layer=IPyAMSLayer,
+             base=BaseParagraphAJAXAddForm)
 class ContactParagraphAddForm(AdminDialogAddForm):
     """Contact paragraph add form"""
 
@@ -66,7 +68,6 @@
     icon_css_class = 'fa fa-fw fa-id-card-o'
 
     fields = field.Fields(IContactParagraph).omit('__parent__', '__name__', 'visible')
-    ajax_handler = 'add-contact-paragraph.json'
     edit_permission = MANAGE_CONTENT_PERMISSION
 
     def updateWidgets(self, prefix=None):
@@ -81,14 +82,10 @@
         IParagraphContainer(self.context).append(object)
 
 
-@view_config(name='add-contact-paragraph.json', context=IParagraphContainerTarget, request_type=IPyAMSLayer,
-             permission=MANAGE_CONTENT_PERMISSION, renderer='json', xhr=True)
-class ContactParagraphAJAXAddForm(BaseParagraphAJAXAddForm, ContactParagraphAddForm):
-    """Contact paragraph add form, JSON renderer"""
-
-
 @pagelet_config(name='properties.html', context=IContactParagraph, layer=IPyAMSLayer,
                 permission=MANAGE_CONTENT_PERMISSION)
+@ajax_config(name='properties.json', context=IContactParagraph, request_type=IPyAMSLayer,
+             base=BaseParagraphAJAXEditForm)
 class ContactParagraphPropertiesEditForm(BaseParagraphPropertiesEditForm):
     """Contact paragraph properties edit form"""
 
@@ -100,7 +97,6 @@
     fields = field.Fields(IContactParagraph).omit('__parent__', '__name__', 'visible')
     fields['renderer'].widgetFactory = RendererFieldWidget
 
-    ajax_handler = 'properties.json'
     edit_permission = MANAGE_CONTENT_PERMISSION
 
     def updateWidgets(self, prefix=None):
@@ -109,19 +105,14 @@
             self.widgets['address'].widget_css_class = 'textarea'
 
 
-@view_config(name='properties.json', context=IContactParagraph, request_type=IPyAMSLayer,
-             permission=MANAGE_CONTENT_PERMISSION, renderer='json', xhr=True)
-class ContactParagraphPropertiesAJAXEditForm(BaseParagraphAJAXEditForm, ContactParagraphPropertiesEditForm):
-    """Contact paragraph properties edit form, JSON renderer"""
-
-
 @adapter_config(context=(IContactParagraph, IPyAMSLayer), provides=IParagraphInnerEditor)
+@ajax_config(name='inner-properties.json', context=IContactParagraph, layer=IPyAMSLayer,
+             base=BaseParagraphAJAXEditForm)
 @implementer(IInnerForm)
 class ContactParagraphInnerEditForm(ContactParagraphPropertiesEditForm):
     """Contact paragraph inner edit form"""
 
     legend = None
-    ajax_handler = 'inner-properties.json'
 
     @property
     def buttons(self):
@@ -130,14 +121,8 @@
         else:
             return button.Buttons()
 
-
-@view_config(name='inner-properties.json', context=IContactParagraph, request_type=IPyAMSLayer,
-             permission=MANAGE_CONTENT_PERMISSION, renderer='json', xhr=True)
-class ContactParagraphInnerAJAXEditForm(BaseParagraphAJAXEditForm, ContactParagraphInnerEditForm):
-    """Contact paragraph inner edit form, JSON renderer"""
-
     def get_ajax_output(self, changes):
-        output = super(ContactParagraphInnerAJAXEditForm, self).get_ajax_output(changes)
+        output = super(self.__class__, self).get_ajax_output(changes)
         updated = changes.get(IBaseParagraph, ())
         if 'title' in updated:
             output.setdefault('events', []).append(get_json_paragraph_refresh_event(self.context, self.request))