Fixes several regressions introduced with the new theme.