First pass at new design.

Spent about an hour last night making new styles for this. Merge if you like.