Improved handling of many different conditions, centralized where user settings will be applied.