New edits

Largely to color scheme and editing