Harmonise settings

Preparing for publishing