More systematic system for converting aesthetics
Extract out mark code
Use new mark translation for point & path
Add conversion for geom_rect
Test tidying