update the gradient colors
resolve merge conflict
add fancy stuff