[Theme Catalog] Support