Merge styles
Removed flat button and renamed the other variants