Updated registration form colors.
Fixed merge conflicts.