more color changing, new buttons [MJ-580]

This is just #364, but merged into a feature branch instead of master.