Woot woot

Color/contour stable, arm bug seems gone, no more swapping; have not
deep tested yet