Merging CSS Shapes to live.

Will go live tomorrow properly.