Improved button color, ready to merge in!