changes some back to master, color tweak to caption controller text