A pile of graphics edits.

Cleaned up graphics, added templates and tweaked justinw2.