Refactor Settings (needed to add locale settings)