Adding a configurable setting
Handling configuration in a different way (per-rendering mode)

and reformatting