diff --git a/.travis.yml b/.travis.yml
index d5dc6624..89e7b979 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,6 +7,8 @@ addons:
     - access_key: $SAUCE_ACCESS_KEY
 install:
   - mkdir -p buildout-cache/downloads
+  - mkdir src
+  - git clone git://github.com/plone/plone.app.contenttypes.git -b mockup-issue-220 src/plone.app.contenttypes
   - python bootstrap.py -c travis.cfg
   - bin/buildout -N -t 3 -c travis.cfg
 script:
@@ -38,8 +40,12 @@ env:
     - ROBOT_REMOTE_URL=http://$SAUCE_USERNAME:$SAUCE_ACCESS_KEY@ondemand.saucelabs.com:80/wd/hub
 matrix:
   allow_failures:
+    - env: BROWSER="platform:OS X 10.8,browserName:iphone,version:6.1,device-orientation:portrait"
+    - env: BROWSER="platform:OS X 10.8,browserName:ipad,version:6.1,device-orientation:portrait"
     - env: BROWSER="platform:Linux,browserName:android,version:4.0,device-type:tablet,device-orientation:portrait"
     - env: BROWSER="platform:Windows 8.1,browserName:internet explorer,version:11"
     - env: BROWSER="platform:Windows 7,browserName:internet explorer,version:10"
     - env: BROWSER="platform:Windows 7,browserName:internet explorer,version:9"
     - env: BROWSER="platform:Windows 7,browserName:internet explorer,version:8"
+    - env: BROWSER="platform:Windows 7,browserName:opera,version:12"
+    - env: BROWSER="platform:OS X 10.8,browserName:safari,version:6"
diff --git a/plone/app/widgets/at.py b/plone/app/widgets/at.py
index 41cc8177..8f67f0a4 100644
--- a/plone/app/widgets/at.py
+++ b/plone/app/widgets/at.py
@@ -569,7 +569,7 @@ def _base_args(self, context, field, request):
         args.setdefault('pattern_options', {})
         merged = dict_merge(get_tinymce_options(context, field, request),
                             args['pattern_options'])
-        args['pattern_options'] = merged
+        args['pattern_options'] = merged['pattern_options']
 
         return args
 
diff --git a/plone/app/widgets/dx.py b/plone/app/widgets/dx.py
index 71afa807..86dd9f25 100644
--- a/plone/app/widgets/dx.py
+++ b/plone/app/widgets/dx.py
@@ -6,9 +6,9 @@
 from datetime import datetime
 
 from plone.app.textfield.widget import IRichTextWidget \
-        as patextfield_IRichTextWidget
+    as patextfield_IRichTextWidget
 from plone.app.textfield.widget import RichTextWidget \
-        as patextfield_RichTextWidget
+    as patextfield_RichTextWidget
 from plone.app.textfield.value import RichTextValue
 from plone.app.widgets.base import InputWidget
 from plone.app.widgets.base import SelectWidget as BaseSelectWidget
@@ -67,7 +67,7 @@
 
 try:
     from plone.app.contenttypes.behaviors.collection import ICollection as IDXCollection  # noqa
-    from plone.app.contenttypes.behaviors.richtext import IRichText # noqa
+    from plone.app.contenttypes.behaviors.richtext import IRichText  # noqa
     HAS_PAC = True
 except ImportError:
     HAS_PAC = False
@@ -727,14 +727,13 @@ def _base_args(self):
         charset = properties.site_properties.getProperty('default_charset',
                                                          'utf-8')
         value = self.value and self.value.raw or u''
-        args['value'] = (self.request.get(self.field.getName(),
-                                     value)
-                         ).decode(charset)
+        args['value'] = (self.request.get(
+            self.field.getName(), value)).decode(charset)
 
         args.setdefault('pattern_options', {})
-        merged = dict_merge(get_tinymce_options(self.context, self.field, self.request),
+        merged = dict_merge(get_tinymce_options(self.context, self.field, self.request),  # noqa
                             args['pattern_options'])
-        args['pattern_options'] = merged
+        args['pattern_options'] = merged['pattern_options']
 
         return args
 
@@ -779,7 +778,6 @@ def RelatedItemsFieldWidget(field, request):
     def QueryStringFieldWidget(field, request):
         return FieldWidget(field, QueryStringWidget(request))
 
-
     @adapter(getSpecification(IRichText['text']), IFormLayer)
     @implementer(IFieldWidget)
     def RichTextFieldWidget(field, request):
diff --git a/plone/app/widgets/tests/test_dx.py b/plone/app/widgets/tests/test_dx.py
index 2d79333a..c3b40e92 100644
--- a/plone/app/widgets/tests/test_dx.py
+++ b/plone/app/widgets/tests/test_dx.py
@@ -914,6 +914,8 @@ def test_widget_params(self):
         from plone.app.widgets.dx import RichTextWidget
 
         widget = FieldWidget(self.field, RichTextWidget(self.request))
+        # set the context so we can get tinymce settings
+        widget.context = self.portal
         widget.update()
         base_args = widget._base_args()
         self.assertEqual(base_args['name'], 'text')
diff --git a/travis.cfg b/travis.cfg
index 3c9c34fa..7e0e1bb0 100644
--- a/travis.cfg
+++ b/travis.cfg
@@ -10,6 +10,8 @@ package-extras = [test,archetypes,dexterity]
 test-eggs = Pillow
 parts += extra
 
+develop = src/plone.app.contenttypes
+
 [extra]
 recipe = zc.recipe.egg
 eggs =
@@ -20,3 +22,4 @@ eggs =
 [versions]
 coverage = 3.7
 plone.app.robotframework = 0.7.5
+plone.app.contenttypes =
\ No newline at end of file
diff --git a/versions.cfg b/versions.cfg
index 0c22b777..fb424982 100644
--- a/versions.cfg
+++ b/versions.cfg
@@ -11,3 +11,19 @@ plone.app.querystring = 1.1.0
 plone.app.vocabularies = 2.1.12
 plone.formwidget.querystring = 1.1.0
 plone.formwidget.recurrence = 1.1
+
+# versions copied from https://github.com/plone/buildout.coredev/blob/5.0/versions.cfg#L39
+plone.app.robotframework = 0.7.5
+plone.app.testing = 4.2.4
+robotframework = 2.8.4
+robotframework-selenium2library = 1.5.0
+robotsuite = 1.4.3
+selenium = 2.39.0
+collective.xmltestreport = 1.3.1
+mock = 1.0.1
+zope.testrunner = 4.1.1
+pep8 = 1.4.6
+Babel = 1.3
+robotframework-selenium2screenshots = 0.4.0
+sphinxcontrib-robotframework = 0.4.3
+Pygments = 1.6
\ No newline at end of file