Changes due to the way 2.0 returns word input

2.0 can return surrounding punctation as the word input when there is no preexisting color, workaround this by replacing the input only if it is a valid color.
Merge remote-tracking branch 'upstream/master'