--- a/src/pyams_content/component/theme/zmi/manager.py	Wed Jun 06 13:32:14 2018 +0200
+++ b/src/pyams_content/component/theme/zmi/manager.py	Fri Jun 08 10:33:23 2018 +0200
@@ -25,13 +25,12 @@
 
 # import packages
 from pyams_content.skin import pyams_content
-from pyams_form.form import AJAXEditForm
+from pyams_form.form import ajax_config
 from pyams_pagelet.pagelet import pagelet_config
 from pyams_skin.viewlet.menu import MenuItem
 from pyams_utils.fanstatic import get_resource_path
 from pyams_viewlet.viewlet import viewlet_config
 from pyams_zmi.form import AdminDialogEditForm
-from pyramid.view import view_config
 from z3c.form import field
 from zope.interface import alsoProvides
 
@@ -51,6 +50,7 @@
 
 @pagelet_config(name='themes.html', context=IThemesManagerTarget, layer=IPyAMSLayer,
                 permission=MANAGE_TOOL_PERMISSION)
+@ajax_config(name='themes.json', context=IThemesManagerTarget, layer=IPyAMSLayer)
 class ThemesManagerEditForm(AdminDialogEditForm):
     """Themes manager edit form"""
 
@@ -59,7 +59,6 @@
     legend = _("Selected themes")
 
     fields = field.Fields(IThemesManager)
-    ajax_handler = 'themes.json'
     edit_permission = MANAGE_TOOL_PERMISSION
 
     def updateWidgets(self, prefix=None):
@@ -73,9 +72,3 @@
                 'ams-plugin-pyams_content-async': 'false'
             }
             alsoProvides(widget, IObjectData)
-
-
-@view_config(name='themes.json', context=IThemesManagerTarget, request_type=IPyAMSLayer,
-             permission=MANAGE_TOOL_PERMISSION, renderer='json', xhr=True)
-class ThemesManagerAJAXEditForm(AJAXEditForm, ThemesManagerEditForm):
-    """Themes manager edit form, JSON renderer"""