Updates to black

Needed to re-arrange class orders for black buttons (since grouping
default and :active)