Style updates, ready for transition to AbstractCollage