Add Support for Themed-Collections