Merge "Fix the text so it's visible with current themes." into nyc-dev