Integrating changes to theme handling