Fixing calls to TextPushButton (colors need to be Scenery Colors), formatting fixes