--- a/src/pyams_content/component/theme/zmi/__init__.py	Wed Jun 06 13:32:14 2018 +0200
+++ b/src/pyams_content/component/theme/zmi/__init__.py	Fri Jun 08 10:33:23 2018 +0200
@@ -28,7 +28,7 @@
 
 # import packages
 from pyams_content.shared.common.zmi import WfSharedContentHeaderAdapter
-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_template.template import template_config
@@ -37,7 +37,6 @@
 from pyams_utils.traversing import get_parent
 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
 
@@ -56,6 +55,7 @@
 
 @pagelet_config(name='themes.html', context=IThemesTarget, layer=IPyAMSLayer, permission=VIEW_SYSTEM_PERMISSION)
 @template_config(template='templates/themes-info.pt', layer=IPyAMSLayer)
+@ajax_config(name='themes.json', context=IThemesTarget, layer=IPyAMSLayer, permission=MANAGE_CONTENT_PERMISSION)
 @implementer(IWidgetForm, IInnerPage)
 class ThemesEditForm(AdminEditForm):
     """Themes edit form"""
@@ -64,8 +64,6 @@
 
     fields = field.Fields(IThemesInfo)
 
-    ajax_handler = 'themes.json'
-
     def __init__(self, context, request):
         super(ThemesEditForm, self).__init__(context, request)
         target = get_parent(self.context, IThemesManagerTarget)
@@ -96,12 +94,6 @@
                     yield another
 
 
-@view_config(name='themes.json', context=IThemesTarget, request_type=IPyAMSLayer,
-             permission=MANAGE_CONTENT_PERMISSION, renderer='json', xhr=True)
-class ThemesAJAXEditForm(AJAXEditForm, ThemesEditForm):
-    """Themes edit form, JSON renderer"""
-
-
 @adapter_config(context=(IThemesTarget, IAdminLayer, ThemesEditForm), provides=IPageHeader)
 class ThemesHeaderAdapter(WfSharedContentHeaderAdapter):
     """Shared content themes header adapter"""