Updates for new theme support