Design.s changes for Onyx

Added a bunch of missing kinds in, reorganized to make (nearly) alphabetical.