More peripheral work, added in more types. Tweaked colors.