Added custom colors for several elements
Major css reorg
Merge branch 'develop'