--- a/src/pyams_content/shared/view/zmi/theme.py	Fri Mar 22 17:46:49 2019 +0100
+++ b/src/pyams_content/shared/view/zmi/theme.py	Fri Mar 22 17:47:03 2019 +0100
@@ -12,36 +12,29 @@
 
 __docformat__ = 'restructuredtext'
 
-
-# import standard library
+from z3c.form import button, field
+from z3c.form.browser.checkbox import SingleCheckBoxFieldWidget
+from z3c.form.interfaces import INPUT_MODE
+from zope.interface import Interface, implementer
 
-# import interfaces
+from pyams_content import _
+from pyams_content.component.theme import ICollectionsManager, ITagsManager, IThemesManager
 from pyams_content.interfaces import MANAGE_CONTENT_PERMISSION
-from pyams_content.shared.view.interfaces import IWfView, IViewThemesSettings, IViewsManager, IViewTagsSettings, \
-    IViewCollectionsSettings
-from pyams_form.interfaces.form import IWidgetForm, IUncheckedEditFormButtons
+from pyams_content.shared.view.interfaces import IViewCollectionsSettings, IViewTagsSettings, IViewThemesSettings, \
+    IViewsManager, IWfView
+from pyams_form.form import ajax_config
+from pyams_form.interfaces.form import IUncheckedEditFormButtons, IWidgetForm
+from pyams_pagelet.pagelet import pagelet_config
 from pyams_skin.interfaces import IInnerPage
 from pyams_skin.layer import IPyAMSLayer
-from pyams_thesaurus.interfaces.thesaurus import IThesaurusContextManager
-from pyams_utils.interfaces import VIEW_SYSTEM_PERMISSION
-from pyams_zmi.interfaces.menu import IPropertiesMenu
-from pyams_zmi.layer import IAdminLayer
-from z3c.form.interfaces import INPUT_MODE
-
-# import packages
-from pyams_content.component.theme import ITagsManager
-from pyams_form.form import ajax_config
-from pyams_pagelet.pagelet import pagelet_config
 from pyams_skin.viewlet.menu import MenuItem
 from pyams_thesaurus.zmi.widget import ThesaurusTermsTreeFieldWidget
+from pyams_utils.interfaces import VIEW_SYSTEM_PERMISSION
 from pyams_utils.registry import get_utility
 from pyams_viewlet.viewlet import viewlet_config
 from pyams_zmi.form import AdminEditForm
-from z3c.form import field, button
-from z3c.form.browser.checkbox import SingleCheckBoxFieldWidget
-from zope.interface import implementer, Interface
-
-from pyams_content import _
+from pyams_zmi.interfaces.menu import IPropertiesMenu
+from pyams_zmi.layer import IAdminLayer
 
 
 #
@@ -128,7 +121,7 @@
     def updateWidgets(self, prefix=None):
         super(ViewThemesEditForm, self).updateWidgets(prefix)
         if 'themes' in self.widgets:
-            manager = IThesaurusContextManager(get_utility(IViewsManager))
+            manager = IThemesManager(get_utility(IViewsManager))
             widget = self.widgets['themes']
             widget.label_css_class = 'control-label col-md-2'
             widget.input_css_class = 'col-md-12'
@@ -174,7 +167,7 @@
     def updateWidgets(self, prefix=None):
         super(ViewCollectionsEditForm, self).updateWidgets(prefix)
         if 'collections' in self.widgets:
-            manager = IThesaurusContextManager(get_utility(IViewsManager))
+            manager = ICollectionsManager(get_utility(IViewsManager))
             widget = self.widgets['collections']
             widget.label_css_class = 'control-label col-md-2'
             widget.input_css_class = 'col-md-12'