added orange and modified some others
Merge pull request #2 from pruf/master

added orange and modified some others