Added 8 new categories; modified a number of sorting rules.