small changes to colorname matching