Container refactor. Themes are dead