Preparing for CM11 Themes Support