color changing [MJ-580]
btn text shadow fix [MJ-580]
more color changing, new buttons [MJ-580]
email template button [MJ-580]
Fix merge conflicts