Adjust for theme support