Update themes to use new convention.