colors redone; simplified