added more support throughout the theme.