Updated to new button styles globally