updated for theme changes