Go back to one color mask, fix a bunch of stuff