squarewave Update to new dataset and accomodate more colors