#143 buttons follow background color +enhancement