Re-work the existing Settings system