Make some button colors more semantic