Updates for 2.x branch.

... theme.