Just keeping the theme up-to-date with trunk.