Rearranged some parameters in the theme API.