Redesign races using new scheme; add races from Core, Uncommon