Use remove-dt-dl-dd branch of plone.app.content
Use remove-dt-dl-dd branch of plone.app.layout