Reworked settings files