Use tikz to layout logo
Tidy up color names