1.0.0.6 - grayscale, refactor