#141 buttons follow background color +enhancement