ThemeService: remove cm stuff