--- a/src/pyams_content/component/video/zmi/paragraph.py	Wed Jun 06 13:32:14 2018 +0200
+++ b/src/pyams_content/component/video/zmi/paragraph.py	Fri Jun 08 10:33:23 2018 +0200
@@ -34,6 +34,7 @@
     IParagraphEditFormButtons
 from pyams_content.component.video.paragraph import ExternalVideoParagraph
 from pyams_content.features.renderer.zmi.widget import RendererFieldWidget
+from pyams_form.form import ajax_config
 from pyams_form.group import NamedWidgetsGroup
 from pyams_pagelet.pagelet import pagelet_config
 from pyams_template.template import template_config
@@ -66,6 +67,8 @@
 
 @pagelet_config(name='add-external-video.html', context=IParagraphContainerTarget, layer=IPyAMSLayer,
                 permission=MANAGE_CONTENT_PERMISSION)
+@ajax_config(name='add-external-video.json', context=IParagraphContainerTarget, layer=IPyAMSLayer,
+             base=BaseParagraphAJAXAddForm)
 class ExternalVideoParagraphAddForm(AdminDialogAddForm):
     """External video paragraph add form"""
 
@@ -74,7 +77,6 @@
     icon_css_class = 'fa fa-fw fa-youtube-play'
 
     fields = field.Fields(IExternalVideoParagraph).omit('__parent__', '__name__', 'visible')
-    ajax_handler = 'add-external-video.json'
     edit_permission = MANAGE_CONTENT_PERMISSION
 
     def updateWidgets(self, prefix=None):
@@ -131,12 +133,6 @@
         IParagraphContainer(self.context).append(object)
 
 
-@view_config(name='add-external-video.json', context=IParagraphContainerTarget, request_type=IPyAMSLayer,
-             permission=MANAGE_CONTENT_PERMISSION, renderer='json', xhr=True)
-class ExternalVideoParagraphAJAXAddForm(BaseParagraphAJAXAddForm, ExternalVideoParagraphAddForm):
-    """External video paragraph add form, JSON renderer"""
-
-
 @subscriber(IDataExtractedEvent, form_selector=ExternalVideoParagraphAddForm)
 def handle_video_paragraph_add_form_data_extraction(event):
     """Handle provider name data extraction"""
@@ -201,6 +197,8 @@
 
 @pagelet_config(name='properties.html', context=IExternalVideoParagraph, layer=IPyAMSLayer,
                 permission=MANAGE_CONTENT_PERMISSION)
+@ajax_config(name='properties.json', context=IExternalVideoParagraph, layer=IPyAMSLayer,
+             base=BaseParagraphAJAXEditForm)
 class ExternalVideoParagraphPropertiesEditForm(BaseParagraphPropertiesEditForm):
     """External video paragraph properties edit form"""
 
@@ -209,7 +207,6 @@
     legend = _("Edit video properties")
     icon_css_class = 'fa fa-fw fa-youtube-play'
 
-    ajax_handler = 'properties.json'
     edit_permission = MANAGE_CONTENT_PERMISSION
 
     @property
@@ -262,14 +259,8 @@
                                                      switch=True,
                                                      display_mode='never'))
 
-
-@view_config(name='properties.json', context=IExternalVideoParagraph, request_type=IPyAMSLayer,
-             permission=MANAGE_CONTENT_PERMISSION, renderer='json', xhr=True)
-class ExternalVideoParagraphPropertiesAJAXEditForm(BaseParagraphAJAXEditForm, ExternalVideoParagraphPropertiesEditForm):
-    """External video paragraph properties edit form, JSON renderer"""
-
     def get_ajax_output(self, changes):
-        output = super(ExternalVideoParagraphPropertiesAJAXEditForm, self).get_ajax_output(changes)
+        output = super(self.__class__, self).get_ajax_output(changes)
         if 'title' in changes.get(IBaseParagraph, ()):
             output.setdefault('events', []).append(
                 get_json_paragraph_refresh_event(self.context, self.request))
@@ -277,12 +268,13 @@
 
 
 @adapter_config(context=(IExternalVideoParagraph, IPyAMSLayer), provides=IParagraphInnerEditor)
+@ajax_config(name='inner-properties.json', context=IExternalVideoParagraph, layer=IPyAMSLayer,
+             base=BaseParagraphAJAXEditForm)
 @implementer(IInnerForm)
 class ExternalVideoParagraphInnerEditForm(ExternalVideoParagraphPropertiesEditForm):
     """External video paragraph properties inner deit form"""
 
     legend = None
-    ajax_handler = 'inner-properties.json'
 
     @property
     def buttons(self):
@@ -290,9 +282,3 @@
             return button.Buttons(IParagraphEditFormButtons)
         else:
             return button.Buttons()
-
-
-@view_config(name='inner-properties.json', context=IExternalVideoParagraph, request_type=IPyAMSLayer,
-             permission=MANAGE_CONTENT_PERMISSION, renderer='json', xhr=True)
-class ExternalVideoParagraphInnerAJAXEditForm(BaseParagraphAJAXEditForm, ExternalVideoParagraphInnerEditForm):
-    """External video paragraph inner edit form, JSON renderer"""