Refactor, fix bug with Color ValueOf(string)