Move color tone logic. AH-248
Code cleaning. AH-248