--- a/src/pyams_content/shared/common/zmi/manager.py	Wed Jun 06 13:32:14 2018 +0200
+++ b/src/pyams_content/shared/common/zmi/manager.py	Fri Jun 08 10:33:23 2018 +0200
@@ -30,7 +30,7 @@
 from z3c.form.interfaces import DISPLAY_MODE
 
 # import packages
-from pyams_form.form import AJAXEditForm
+from pyams_form.form import ajax_config
 from pyams_form.help import FormHelp
 from pyams_pagelet.pagelet import pagelet_config
 from pyams_skin.page import DefaultPageHeaderAdapter
@@ -40,7 +40,6 @@
 from pyams_viewlet.manager import viewletmanager_config
 from pyams_viewlet.viewlet import viewlet_config
 from pyams_zmi.form import AdminEditForm
-from pyramid.view import view_config
 from z3c.form import field
 from zope.interface import implementer, Interface
 
@@ -100,6 +99,7 @@
 
 
 @pagelet_config(name='properties.html', context=IBaseSharedTool, layer=IPyAMSLayer, permission=MANAGE_TOOL_PERMISSION)
+@ajax_config(name='properties.json', context=IBaseSharedTool, layer=IPyAMSLayer)
 @implementer(IWidgetForm, IInnerPage, IPropertiesEditForm)
 class SharedToolPropertiesEditForm(AdminEditForm):
     """Shared tool properties edit form"""
@@ -108,7 +108,6 @@
 
     fields = field.Fields(IBaseSharedTool).omit('__parent__', '__name__')
 
-    ajax_handler = 'properties.json'
     edit_permission = MANAGE_TOOL_PERMISSION
 
     def updateWidgets(self, prefix=None):
@@ -117,12 +116,6 @@
             self.widgets['shared_content_workflow'].mode = DISPLAY_MODE
 
 
-@view_config(name='properties.json', context=IBaseSharedTool, request_type=IPyAMSLayer,
-             permission=MANAGE_TOOL_PERMISSION, renderer='json', xhr=True)
-class SharedToolPropertiesAJAXEditForm(AJAXEditForm, SharedToolPropertiesEditForm):
-    """Shared tool properties edit form, JSON renderer"""
-
-
 @adapter_config(context=(IBaseSharedTool, IPyAMSLayer, SharedToolPropertiesEditForm), provides=IFormHelp)
 class SharedToolPropertiesHelpAdapter(FormHelp):
     """Shared tool properties help adapter"""
@@ -161,6 +154,7 @@
 
 
 @pagelet_config(name='languages.html', context=IBaseSharedTool, layer=IPyAMSLayer, permission=MANAGE_TOOL_PERMISSION)
+@ajax_config(name='languages.json', context=IBaseSharedTool, layer=IPyAMSLayer)
 @implementer(IInnerPage, IWidgetForm)
 class SharedToolLanguagesEditForm(AdminEditForm):
     """Shared tool languages edit form"""
@@ -168,16 +162,9 @@
     legend = _("Content languages")
 
     fields = field.Fields(II18nManager)
-    ajax_handler = 'languages.json'
     edit_permission = MANAGE_TOOL_PERMISSION
 
 
-@view_config(name='languages.json', context=IBaseSharedTool, request_type=IPyAMSLayer,
-             permission=MANAGE_TOOL_PERMISSION, renderer='json', xhr=True)
-class SharedToolLanguagesAJAXEditForm(AJAXEditForm, SharedToolLanguagesEditForm):
-    """Shared tool languages edit form, JSON renderer"""
-
-
 @adapter_config(context=(IBaseSharedTool, IPyAMSLayer, SharedToolLanguagesEditForm), provides=IFormHelp)
 class SharedToolLanguagesEditFormHelp(FormHelp):
     """Shared tool languages edit form help"""