--- a/src/pyams_content/component/theme/zmi/manager.py	Wed Dec 12 18:01:44 2018 +0100
+++ b/src/pyams_content/component/theme/zmi/manager.py	Wed Dec 12 22:58:37 2018 +0100
@@ -12,30 +12,27 @@
 
 __docformat__ = 'restructuredtext'
 
+from z3c.form import field
+from z3c.form.browser.checkbox import SingleCheckBoxFieldWidget
+from zope.interface import alsoProvides
 
-# import standard library
-
-# import interfaces
 from pyams_content.component.theme.interfaces import \
     ITagsManagerTarget, ITagsManager, \
     IThemesManagerTarget, IThemesManager, \
     ICollectionsManagerTarget, ICollectionsManager
 from pyams_content.interfaces import MANAGE_TOOL_PERMISSION, MANAGE_SITE_ROOT_PERMISSION
-from pyams_skin.layer import IPyAMSLayer
-from pyams_utils.interfaces.data import IObjectData
-from pyams_zmi.interfaces.menu import IPropertiesMenu
-from pyams_zmi.layer import IAdminLayer
-
-# import packages
 from pyams_content.zmi import pyams_content
 from pyams_form.form import ajax_config
+from pyams_form.group import NamedWidgetsGroup
 from pyams_pagelet.pagelet import pagelet_config
+from pyams_skin.layer import IPyAMSLayer
 from pyams_skin.viewlet.menu import MenuItem, MenuDivider
 from pyams_utils.fanstatic import get_resource_path
+from pyams_utils.interfaces.data import IObjectData
 from pyams_viewlet.viewlet import viewlet_config
 from pyams_zmi.form import AdminDialogEditForm
-from z3c.form import field
-from zope.interface import alsoProvides
+from pyams_zmi.interfaces.menu import IPropertiesMenu
+from pyams_zmi.layer import IAdminLayer
 
 from pyams_content import _
 
@@ -73,6 +70,9 @@
     dialog_class = 'modal-large'
 
     fields = field.Fields(ITagsManager)
+    fields['enable_tags_search'].widgetFactory = SingleCheckBoxFieldWidget
+    fields['enable_glossary'].widgetFactory = SingleCheckBoxFieldWidget
+
     edit_permission = MANAGE_SITE_ROOT_PERMISSION
 
     def getContent(self):
@@ -96,6 +96,23 @@
         }
         alsoProvides(widget, IObjectData)
 
+    def updateGroups(self):
+        self.add_group(NamedWidgetsGroup(self, 'tags_search', self.widgets,
+                                         ('enable_tags_search', 'tags_search_target'),
+                                         legend=_("Enable search by tag"),
+                                         css_class='inner',
+                                         switch=True,
+                                         checkbox_switch=True,
+                                         checkbox_field=ITagsManager['enable_tags_search']))
+        self.add_group(NamedWidgetsGroup(self, 'glossary', self.widgets,
+                                         ('enable_glossary', 'glossary_thesaurus_name'),
+                                         legend=_("Enable glossary"),
+                                         css_class='inner',
+                                         switch=True,
+                                         checkbox_switch=True,
+                                         checkbox_field=ITagsManager['enable_glossary']))
+        super(TagsManagerEditForm, self).updateGroups()
+
 
 #
 # Themes management view