A lot of work on devise. corrected a few colors on NON devise buttons.