GCP-6868 Theming Effort - ETL