[FR] button-state-container?

[CaptainVarghoss]

I'm not a pro at CSS, but it seems like it would be easier, and more flexible, if there was a button-state-container with button-state inside instead of button-state being inside the button-name-container. It's a little difficult to get them separated for a custom layout as it is.