Refactor settings and include contributors in categories