--- a/src/pyams_content/shared/view/zmi/theme.py	Tue Jul 10 16:59:55 2018 +0200
+++ b/src/pyams_content/shared/view/zmi/theme.py	Wed Jul 11 10:18:10 2018 +0200
@@ -9,7 +9,6 @@
 # WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
 # FOR A PARTICULAR PURPOSE.
 #
-from pyams_content.component.theme import ITagsManager
 
 __docformat__ = 'restructuredtext'
 
@@ -18,7 +17,8 @@
 
 # import interfaces
 from pyams_content.interfaces import MANAGE_CONTENT_PERMISSION
-from pyams_content.shared.view.interfaces import IWfView, IViewThemesSettings, IViewsManager, IViewTagsSettings
+from pyams_content.shared.view.interfaces import IWfView, IViewThemesSettings, IViewsManager, IViewTagsSettings, \
+    IViewCollectionsSettings
 from pyams_form.interfaces.form import IWidgetForm, IUncheckedEditFormButtons
 from pyams_skin.interfaces import IInnerPage
 from pyams_skin.layer import IPyAMSLayer
@@ -29,13 +29,16 @@
 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.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 _
@@ -62,8 +65,12 @@
     """View tags settings edit form"""
 
     legend = _("View tags settings")
+    label_css_class = 'control-label col-md-1'
+    input_css_class = 'col-md-11'
 
     fields = field.Fields(IViewTagsSettings)
+    fields['select_context_tags'].widgetFactory = SingleCheckBoxFieldWidget
+    fields['tags'].widgetFactory = ThesaurusTermsTreeFieldWidget
 
     @property
     def buttons(self):
@@ -76,8 +83,11 @@
         super(ViewTagsEditForm, self).updateWidgets(prefix)
         if 'tags' in self.widgets:
             manager = ITagsManager(self.request.root)
-            self.widgets['tags'].thesaurus_name = manager.thesaurus_name
-            self.widgets['tags'].extract_name = manager.extract_name
+            widget = self.widgets['tags']
+            widget.label_css_class = 'control-label col-md-2'
+            widget.input_css_class = 'col-md-12'
+            widget.thesaurus_name = manager.thesaurus_name
+            widget.extract_name = manager.extract_name
 
 
 #
@@ -101,8 +111,12 @@
     """View themes settings edit form"""
 
     legend = _("View themes settings")
+    label_css_class = 'control-label col-md-1'
+    input_css_class = 'col-md-11'
 
     fields = field.Fields(IViewThemesSettings)
+    fields['select_context_themes'].widgetFactory = SingleCheckBoxFieldWidget
+    fields['themes'].widgetFactory = ThesaurusTermsTreeFieldWidget
 
     @property
     def buttons(self):
@@ -114,5 +128,55 @@
     def updateWidgets(self, prefix=None):
         super(ViewThemesEditForm, self).updateWidgets(prefix)
         if 'themes' in self.widgets:
-            manager = get_utility(IViewsManager)
-            self.widgets['themes'].thesaurus_name = IThesaurusContextManager(manager).thesaurus_name
+            manager = IThesaurusContextManager(get_utility(IViewsManager))
+            widget = self.widgets['themes']
+            widget.label_css_class = 'control-label col-md-2'
+            widget.input_css_class = 'col-md-12'
+            widget.thesaurus_name = manager.thesaurus_name
+            widget.extract_name = manager.extract_name
+
+
+#
+# Collections management
+#
+
+@viewlet_config(name='collections.menu', context=IWfView, layer=IAdminLayer,
+                manager=IPropertiesMenu, permission=VIEW_SYSTEM_PERMISSION, weight=354)
+class ViewCollectionsMenu(MenuItem):
+    """View collections menu"""
+
+    label = _("Collections...")
+    icon_class = 'fa-book'
+    url = '#collections.html'
+
+
+@pagelet_config(name='collections.html', context=IWfView, layer=IPyAMSLayer, permission=VIEW_SYSTEM_PERMISSION)
+@ajax_config(name='collections.json', context=IWfView, layer=IPyAMSLayer, permission=MANAGE_CONTENT_PERMISSION)
+@implementer(IWidgetForm, IInnerPage)
+class ViewCollectionsEditForm(AdminEditForm):
+    """View collections settings edit form"""
+
+    legend = _("View collections settings")
+    label_css_class = 'control-label col-md-1'
+    input_css_class = 'col-md-11'
+
+    fields = field.Fields(IViewCollectionsSettings)
+    fields['select_context_collections'].widgetFactory = SingleCheckBoxFieldWidget
+    fields['collections'].widgetFactory = ThesaurusTermsTreeFieldWidget
+
+    @property
+    def buttons(self):
+        if self.mode == INPUT_MODE:
+            return button.Buttons(IUncheckedEditFormButtons)
+        else:
+            return button.Buttons(Interface)
+
+    def updateWidgets(self, prefix=None):
+        super(ViewCollectionsEditForm, self).updateWidgets(prefix)
+        if 'collections' in self.widgets:
+            manager = IThesaurusContextManager(get_utility(IViewsManager))
+            widget = self.widgets['collections']
+            widget.label_css_class = 'control-label col-md-2'
+            widget.input_css_class = 'col-md-12'
+            widget.thesaurus_name = manager.thesaurus_name
+            widget.extract_name = manager.extract_name