Added button toggles with color