Tidied config setting, and made them uniform (same order)