Reworked settings  Owain94 WIP