Cleaning up / reorganising contenttypes.yml.dist. Working on #1715
Updating bolt.css