Changes for design and theme integrations