Redefined colors
Reorganized list of colors
Merge pull request #21 from ipa-nhg/master

Renamed colors