--- a/src/pyams_default_theme/component/paragraph/frame.py	Fri May 18 08:47:41 2018 +0200
+++ b/src/pyams_default_theme/component/paragraph/frame.py	Fri May 18 08:48:24 2018 +0200
@@ -25,12 +25,11 @@
     ILateralFrameParagraphRendererSettings, IDefaultFrameParagraphRendererSettings
 from pyams_i18n.interfaces import II18n
 from pyams_skin.layer import IPyAMSLayer
-from zope.annotation.interfaces import IAnnotations
 
 # import packages
-from pyams_content.features.renderer.zmi import BaseContentRenderer
+from pyams_content.features.renderer.skin import BaseContentRenderer
 from pyams_template.template import template_config
-from pyams_utils.adapter import adapter_config
+from pyams_utils.adapter import adapter_config, get_annotation_adapter
 from zope.interface import implementer
 from zope.location import locate, Location
 from zope.schema.fieldproperty import FieldProperty
@@ -75,12 +74,8 @@
 @adapter_config(context=IFrameParagraph, provides=IDefaultFrameParagraphRendererSettings)
 def default_frame_paragraph_renderer_settings_factory(context):
     """Frame paragraph default renderer settings factory"""
-    annotations = IAnnotations(context)
-    settings = annotations.get(FRAME_PARAGRAPH_RENDERER_SETTINGS_KEY)
-    if settings is None:
-        settings = annotations[FRAME_PARAGRAPH_RENDERER_SETTINGS_KEY] = DefaultFrameParagraphRendererSettings()
-        locate(settings, context)
-    return settings
+    return get_annotation_adapter(context, FRAME_PARAGRAPH_RENDERER_SETTINGS_KEY,
+                                  DefaultFrameParagraphRendererSettings)
 
 
 @implementer(ILateralFrameParagraphRendererSettings)
@@ -96,12 +91,8 @@
 @adapter_config(context=IFrameParagraph, provides=ILateralFrameParagraphRendererSettings)
 def lateral_frame_paragraph_renderer_settings_factory(context):
     """Frame text paragraph lateral renderer settings factory"""
-    annotations = IAnnotations(context)
-    settings = annotations.get(LATERAL_FRAME_PARAGRAPH_RENDERER_SETTINGS_KEY)
-    if settings is None:
-        settings = annotations[LATERAL_FRAME_PARAGRAPH_RENDERER_SETTINGS_KEY] = LateralFrameParagraphRendererSettings()
-        locate(settings, context)
-    return settings
+    return get_annotation_adapter(context, LATERAL_FRAME_PARAGRAPH_RENDERER_SETTINGS_KEY,
+                                  LateralFrameParagraphRendererSettings)
 
 
 #