added orange and modified some others