zds++
change the name of the categories
consistent ordering for headers