design.js changes - reorganize (mostly) alphabetical, and add new kinds