Bring flair into the new settings

Commit

7 years ago

Bring flair into the new settings Makes the flair options in old settings look broken (cosmetic issues), but it's fine because we're ripping that out in due time.