--- a/src/pyams_content/component/theme/zmi/portlet.py	Tue Jul 10 16:59:55 2018 +0200
+++ b/src/pyams_content/component/theme/zmi/portlet.py	Wed Jul 11 10:18:10 2018 +0200
@@ -16,7 +16,8 @@
 # import standard library
 
 # import interfaces
-from pyams_content.component.theme.interfaces import IPortletThemesSettingsTarget
+from pyams_content.component.theme.interfaces import IPortletTagsSettingsTarget, IPortletThemesSettingsTarget, \
+    IPortletCollectionsSettingsTarget, IPortletTagsSettings, IPortletThemesSettings, IPortletCollectionsSettings
 from pyams_form.interfaces.form import IInnerTabForm
 from pyams_skin.layer import IPyAMSLayer
 
@@ -25,11 +26,25 @@
 from pyams_utils.adapter import adapter_config
 from pyams_zmi.form import InnerAdminEditForm
 from z3c.form import field
-from zope.interface import Interface
 
 from pyams_content import _
 
 
+@adapter_config(name='tags', context=(IPortletTagsSettingsTarget, IPyAMSLayer, PortletSettingsEditor),
+                provides=IInnerTabForm)
+class PortletSettingsTagsEditor(InnerAdminEditForm):
+    """Portlet settings for tags"""
+
+    prefix = 'tags_form.'
+
+    tab_label = _("Tags")
+    legend = None
+
+    fields = field.Fields(IPortletTagsSettings)
+
+    weight = 50
+
+
 @adapter_config(name='themes', context=(IPortletThemesSettingsTarget, IPyAMSLayer, PortletSettingsEditor),
                 provides=IInnerTabForm)
 class PortletSettingsThemesEditor(InnerAdminEditForm):
@@ -40,6 +55,21 @@
     tab_label = _("Themes")
     legend = None
 
-    fields = field.Fields(Interface)
+    fields = field.Fields(IPortletThemesSettings)
+
+    weight = 52
+
 
-    weight = 50
+@adapter_config(name='collections', context=(IPortletCollectionsSettingsTarget, IPyAMSLayer, PortletSettingsEditor),
+                provides=IInnerTabForm)
+class PortletSettingsCollectionsEditor(InnerAdminEditForm):
+    """Portlet settings for collections"""
+
+    prefix = 'collections_form.'
+
+    tab_label = _("Collections")
+    legend = None
+
+    fields = field.Fields(IPortletCollectionsSettings)
+
+    weight = 54