Upgrade building blocks to use styles from fxos 2.