Rework settings with @regilero