Buttons, hovers etc
Merged conflicts