Substantial improvements to new theme.