reformatted keywords, grouping by prefix

Would like a second set of eyes for a sanity check.