--- a/src/pyams_content/component/gallery/__init__.py	Sun Feb 11 12:11:05 2018 +0100
+++ b/src/pyams_content/component/gallery/__init__.py	Thu Feb 15 15:08:29 2018 +0100
@@ -16,8 +16,8 @@
 # import standard library
 
 # import interfaces
-from pyams_content.component.gallery.interfaces import IGallery, IGalleryTarget, \
-    GALLERY_CONTAINER_KEY, IGalleryRenderer
+from pyams_content.component.gallery.interfaces import IBaseGallery, IGallery, IGalleryTarget, \
+    GALLERY_CONTAINER_KEY
 from pyams_content.component.paragraph import IBaseParagraph
 from pyams_content.features.checker.interfaces import IContentChecker
 from pyams_content.shared.common.interfaces import IWfSharedContent
@@ -31,18 +31,16 @@
 # import packages
 from pyams_catalog.utils import index_object
 from pyams_content.features.checker import BaseContentChecker
+from pyams_content.features.renderer import RenderedContentMixin
 from pyams_utils.adapter import adapter_config, ContextAdapter
 from pyams_utils.container import BTreeOrderedContainer
-from pyams_utils.request import check_request
 from pyams_utils.traversing import get_parent
-from pyams_utils.vocabulary import vocabulary_config
 from pyramid.events import subscriber
 from pyramid.threadlocal import get_current_registry
 from zope.interface import implementer
 from zope.lifecycleevent import ObjectCreatedEvent, ObjectModifiedEvent
 from zope.location import locate
 from zope.schema.fieldproperty import FieldProperty
-from zope.schema.vocabulary import SimpleVocabulary, SimpleTerm
 
 from pyams_content import _
 
@@ -52,7 +50,7 @@
 #
 
 @implementer(IGallery)
-class Gallery(BTreeOrderedContainer):
+class Gallery(BTreeOrderedContainer, RenderedContentMixin):
     """Gallery persistent class"""
 
     title = FieldProperty(IGallery['title'])
@@ -179,18 +177,3 @@
 def GalleryTargetContentChecker(context):
     gallery = IGallery(context)
     return IContentChecker(gallery, None)
-
-
-@vocabulary_config(name='PyAMS gallery renderers')
-class GalleryRendererVocabulary(SimpleVocabulary):
-    """Gallery renderer utilities vocabulary"""
-
-    def __init__(self, context=None):
-        request = check_request()
-        translate = request.localizer.translate
-        registry = request.registry
-        context = Gallery()
-        terms = [SimpleTerm(name, title=translate(adapter.label))
-                 for name, adapter in sorted(registry.getAdapters((context, request), IGalleryRenderer),
-                                             key=lambda x: x[1].weight)]
-        super(GalleryRendererVocabulary, self).__init__(terms)