removed ds
added more colors, not all working atm