Changes to make the buttons show up with certain color schemes. Not perfect but better.