#409 Remove color fix since style applied should already do it
Merge remote-tracking branch 'origin/master'