remove monkeypatch. start to make it base plone theme
backport some of the work of rcse