colors and icons
Minor updates
Merge pull request #1 from m-schrepel/master

Merge pull request #1 from m-schrepel/master