Made minor modifications, working on new color fade