Finishing up Colors
Merge pull request #152 from CruGlobal/css-rearrange

Finishing up Colors