Config Tidy

We no longer to onPublish only onSave, its to messy on onPublish, if
things change with saved inbetween.